From 62e39eb7c8af3c25c43548c27b2db0a9ba3c4aae Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Fri, 23 Aug 2019 20:31:07 +0200 Subject: [PATCH 1/7] Title bar support (#1613) Title bar support X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@398b433b4403c38188ae51dc57029b604c6009aa X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../FirefoxReality/app/src/main/res/values/strings.xml | 9 +++++++++ _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index 49fcf5f777d..5595ccaa667 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -885,4 +885,13 @@ Default + + + %1$s Home + + + Bookmarks + + + History diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index 4d680a1dd39..1e99491913c 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "9c4cba92f1ba79837ea2d81b9c4e5b235b30b69f" + "master": "398b433b4403c38188ae51dc57029b604c6009aa" } } \ No newline at end of file From c6bff957cb39e7b1b9db8dae93546d7b7b2a74df Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Mon, 26 Aug 2019 21:07:12 +0200 Subject: [PATCH 2/7] Media controls in the title bar (#1660) Also a few fixes for the title bar X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@05fb61d53f6ead85a69a6c4d739d3816f1251f51 X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../FirefoxReality/app/src/main/res/values/strings.xml | 8 ++++++++ _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index 5595ccaa667..4721f44ad8c 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -734,6 +734,14 @@ 'Stop' stops the current page load. --> Stop Loading + + Resume + + + Pause + Home diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index 1e99491913c..5f864131600 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "398b433b4403c38188ae51dc57029b604c6009aa" + "master": "05fb61d53f6ead85a69a6c4d739d3816f1251f51" } } \ No newline at end of file From 297879228f2ff92d57374e17701eb1e42f198981 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Tue, 27 Aug 2019 19:52:55 +0200 Subject: [PATCH 3/7] Adds close button when in private mode and one window is left (#1680) X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@f3ada542aa91d0a2894ccb7557b001a86ebfa548 X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../FirefoxReality/app/src/main/res/values/strings.xml | 4 ++++ _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index 4721f44ad8c..e49c6dd3e6f 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -902,4 +902,8 @@ History + + + Clear diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index 5f864131600..d4a31bd8ee8 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "05fb61d53f6ead85a69a6c4d739d3816f1251f51" + "master": "f3ada542aa91d0a2894ccb7557b001a86ebfa548" } } \ No newline at end of file From 01e28497a71d6701b3a712ef181cd12ed7cfe293 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Tue, 27 Aug 2019 20:05:30 +0200 Subject: [PATCH 4/7] History feed (#1656) * History feed * Do not show redirects in the history feed Also avoid storing URLs manually and rely o the history delegate for all history management * Refactor title bar update code * Added support for getVisited and visited links colouring Also fixed an issue with history sections and made the historyListener a delegate as having multiple listeners is not really necessary * Fixed rebase issue * Update history entries when revisited Also fixed history cleanup ranges * Handle dim when history is opened X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@d2f07b01c1f3bada43faec6fef1ea3308c79761b X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../app/src/main/res/values/strings.xml | 83 +++++++++++++++++-- _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index e49c6dd3e6f..aba4630439e 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -637,6 +637,9 @@ Bookmarks + + Loading Bookmarks + @@ -661,6 +664,71 @@ all the bookmarks. --> Show All Bookmarks + + History + + + You can access your browsing history here + + + Loading History + + + Today + + + Yesterday + + + Last Week + + + Older + + + Clear History + + + Cancel + + + Clear Now + + + Today + + + Yesterday + + + Last week + + + Everything + + + Time range to clear: + + + Open in a New Window + + + Add to Bookmarks + + + Remove from Bookmarks + Reset Display Settings @@ -808,10 +876,14 @@ tray. The button it labels, when pressed, opens a new browser window. --> Open a New Window - - Show history + + Open History + + + Close History Remove All @@ -857,7 +929,8 @@ - Only 3 windows can be open. Close one to open another. + Only %1$s windows can be open. Close one to open another. + OK diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index d4a31bd8ee8..d1d1fca69d7 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "f3ada542aa91d0a2894ccb7557b001a86ebfa548" + "master": "d2f07b01c1f3bada43faec6fef1ea3308c79761b" } } \ No newline at end of file From 1bd90a2b581dc5eec06741484fcd444b70025311 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Thu, 29 Aug 2019 18:33:18 +0200 Subject: [PATCH 5/7] Update Bookmarks UI (#1704) * Update Bookmarks UI * Fixed crash when scrolling X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@357f7e126f7a0ae4d649a57e71d6cc2e22a07edc X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../app/src/main/res/values/strings.xml | 13 +++++++++++++ _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index aba4630439e..41bbdbc9d08 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -637,6 +637,12 @@ Bookmarks + + Your Bookmarks List is Empty + + + Click the @ icon when you’re on a page to add it to your bookmarks. + Loading Bookmarks @@ -645,6 +651,10 @@ item listed in the Bookmarks List. --> Remove Bookmark + + Saved to Bookmarks! + @@ -667,6 +677,9 @@ History + + Your History is Empty + You can access your browsing history here diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index d1d1fca69d7..5435e08e7ef 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "d2f07b01c1f3bada43faec6fef1ea3308c79761b" + "master": "357f7e126f7a0ae4d649a57e71d6cc2e22a07edc" } } \ No newline at end of file From 68b537b389c877ab1c58bf67295401af1d7f81ee Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Mon, 9 Sep 2019 22:22:54 +0200 Subject: [PATCH 6/7] Added info regarding variable substitution (#1789) X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@ba0fbd66c9cf9a5fe616bfb8fe93079b43f38995 X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../FirefoxReality/app/src/main/res/values/strings.xml | 3 ++- _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index 41bbdbc9d08..f096c3cb006 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -980,7 +980,8 @@ Default - + %1$s Home diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index 5435e08e7ef..f2fe226f4a1 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "357f7e126f7a0ae4d649a57e71d6cc2e22a07edc" + "master": "ba0fbd66c9cf9a5fe616bfb8fe93079b43f38995" } } \ No newline at end of file From 52084d12ddc413704359915af16ccaa39a888c33 Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Mon, 9 Sep 2019 16:13:47 -0700 Subject: [PATCH 7/7] Update voice collection dialog text (#1803) X-Channel-Revision: [master] mozilla-mobile/android-components@762e069631a5fd0c892b08511f68fcc186b830f4 X-Channel-Revision: [master] mozilla-mobile/fenix@44421392bf53cc80294e81365ac0b9e0f727de91 X-Channel-Revision: [master] mozilla-mobile/firefox-tv@1b30c062b17c165f2ab3b59ab35415f34453e7a2 X-Channel-Converted-Revision: [master] MozillaReality/FirefoxReality@e6ec2b6c757f17a5ded6c3225adbbd8db8c6ee85 X-Channel-Revision: [master] mozilla-lockwise/lockwise-android@4828903b236a3e80b37cea71606e5916af53aa9c --- .../FirefoxReality/app/src/main/res/values/strings.xml | 5 +---- _meta/MozillaReality-FirefoxReality.json | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml index f096c3cb006..786209ad784 100644 --- a/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml +++ b/MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml @@ -1,8 +1,5 @@ - - ENTER @@ -967,7 +964,7 @@ - Your data is always secure and never shared with third parties. We collect voice samples to improve the experience and performance of our products. You’ll always be able to use voice search, even if you don’t allow collection.<a href="privacy">Learn More</a> + In order to improve our voice recognition and other services, we need to collect voice samples for research. We store your data securely and without identifying information. You’ll always be able to use voice search, even if you don’t allow collection.<a href="privacy">Learn More</a> diff --git a/_meta/MozillaReality-FirefoxReality.json b/_meta/MozillaReality-FirefoxReality.json index f2fe226f4a1..54804a752ca 100644 --- a/_meta/MozillaReality-FirefoxReality.json +++ b/_meta/MozillaReality-FirefoxReality.json @@ -1,6 +1,6 @@ { "name": "MozillaReality/FirefoxReality", "revs": { - "master": "ba0fbd66c9cf9a5fe616bfb8fe93079b43f38995" + "master": "e6ec2b6c757f17a5ded6c3225adbbd8db8c6ee85" } } \ No newline at end of file