Commit Graph

14409 Commits

Author SHA1 Message Date
Fabrice Di Meglio
a02a7be9dd am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev
* commit '6d26c1738004cd8df1efe2b4d9d98daac3a5555a':
  Fix AppDetails padding on tablet UI
2014-07-21 18:01:44 +00:00
Jason Monk
77fe537382 am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
* commit '724ec85e12405f86948aa235f59426075081b361':
  Add Screen pinning back to settings
2014-07-21 17:24:29 +00:00
Przemyslaw Szczepaniak
892c3d31de am c0bffe71: Fix showing list of languages for picoTTS
* commit 'c0bffe7148173fef2d7c7098c8f791cac710b62f':
  Fix showing list of languages for picoTTS
2014-07-21 15:43:56 +00:00
Przemyslaw Szczepaniak
c0bffe7148 Fix showing list of languages for picoTTS
PicoTTS have a tendency to return a
CHECK_VOICE_DATA_MISSING_DATA for its CHECK_TTS_DATA
activity. This blanks the language selection preference.
The fix is to show languages selection for all
results of CHECK_TTS_DATA that are not a total failure
(TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL).

Change-Id: I984d7cc9b0dc830ad2b8195a820f9b6fc4ddf1e0
(cherry picked from commit e0d519f3cf)
2014-07-21 15:38:16 +00:00
Przemyslaw Szczepaniak
d49dd702b1 am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev
* commit 'd7bdf17aba66b0bd4530773401d54252cf6b180c':
  Make TTS setting transition animation consistent.
2014-07-21 12:32:34 +00:00
Baligh Uddin
a6ed679762 am 790b21d4: (-s ours) Import translations. DO NOT MERGE
* commit '790b21d44d6a84b16c904fbc478cda0bd2d6450f':
  Import translations. DO NOT MERGE
2014-07-21 12:32:33 +00:00
Baligh Uddin
790b21d44d Import translations. DO NOT MERGE
Change-Id: Iab323e1a057a52bb3408a7173fae984a2d9ff240
Auto-generated-cl: translation import
2014-07-20 14:53:03 -07:00
Fabrice Di Meglio
6d26c17380 Merge "Fix AppDetails padding on tablet UI" into lmp-dev 2014-07-20 04:41:30 +00:00
Jason Monk
724ec85e12 Merge "Add Screen pinning back to settings" into lmp-dev 2014-07-20 04:41:30 +00:00
Jason Monk
27d7ea56f3 Add Screen pinning back to settings
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
2014-07-21 09:01:43 -04:00
Baligh Uddin
633b30ad3f am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '0f364cdf63c7405ba30d814f30f6fa1fdfd65ee7':
  Remove deprecated locales - DO NOT MERGE
2014-07-20 02:39:53 +00:00
Tadashi G. Takaoka
05f5734cc5 am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
* commit 'a229125980f12c9debb1c5a827bb96c5620b5705':
  Fix Settings behavior when disabling current IME
2014-07-20 01:04:33 +00:00
Tadashi G. Takaoka
a229125980 Merge "Fix Settings behavior when disabling current IME" into lmp-dev 2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka
a82c3824f3 Fix Settings behavior when disabling current IME
Bug: 16195373
Change-Id: I95d086e152b07e81aece773bc115ac0ac4517392
2014-07-19 17:29:28 -07:00
Baligh Uddin
ff6c12df92 am fdac5db8: (-s ours) Import translations. DO NOT MERGE
* commit 'fdac5db893285b421c9631dbc62b41a46985aa34':
  Import translations. DO NOT MERGE
2014-07-19 21:51:02 +00:00
Baligh Uddin
fdac5db893 Import translations. DO NOT MERGE
Change-Id: If479170defb29f3874fa320e15acd587560cff4c
Auto-generated-cl: translation import
2014-07-19 21:43:32 +00:00
Tadashi G. Takaoka
ecf1b79f16 am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
* commit '721e63fc6da5685a22848c297676dfb5ec959367':
  Remove unnecessary saved persistent preference
2014-07-19 19:13:12 +00:00
Fabrice Di Meglio
38ba9a2d43 Fix AppDetails padding on tablet UI
- force custom padding

See bug #: 13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I5c26402c10a4e717cda22b320ab0790f598591c2
2014-07-18 19:58:50 -07:00
Fabrice Di Meglio
7ca153f117 am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
* commit '6f404853087796d46f7a7ef1ad986ec351cc720c':
  Fix Utils.prepareCustomPreferencesList()
2014-07-19 02:23:26 +00:00
Fabrice Di Meglio
97a18c8111 Fix Utils.prepareCustomPreferencesList()
- and thus fix padding for all Fragments using it

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I862c96d626ed906cbdafcfb40fa0e07bb804160f
2014-07-18 19:12:36 -07:00
Fabrice Di Meglio
595b61eb39 am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
* commit '39a2cbb32cd93d7eb61a82f395a202238c10e76c':
  Fix the way we select and apply Themes
2014-07-19 00:59:02 +00:00
Fabrice Di Meglio
712df6cb70 Fix the way we select and apply Themes
- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar

Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
2014-07-18 17:44:37 -07:00
Fabrice Di Meglio
ce0e3008e8 am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
* commit '84dfc0b5d64f9a7224e524794783080fc1b0419e':
  Fix overdraw and do some layout optimizations
2014-07-19 00:06:37 +00:00
Fabrice Di Meglio
d40dd45c18 Fix overdraw and do some layout optimizations
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences

The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"

Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
2014-07-18 16:33:32 -07:00
Adam Lesinski
3becea17e7 am 8d7be7b7: Update Settings to use new UsageStats API
* commit '8d7be7b738cce9facdd8832aa845ceb79c19ffc6':
  Update Settings to use new UsageStats API
2014-07-18 22:29:04 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Jeff Davidson
2622bd7599 am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev
* commit '878ca0edb9598de695750b72c7cd3d1c056d984c':
  Link WifiAssistant card with actual settings.
2014-07-18 20:59:42 +00:00
Paul Lawrence
bf05242300 am 312927ab: Material fixes for tablets
* commit '312927abd77b0884eed9aa2ca1de4d0c04b4165f':
  Material fixes for tablets
2014-07-18 19:54:06 +00:00
Paul Lawrence
312927abd7 Material fixes for tablets
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.

Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
2014-07-18 19:49:26 +00:00
Maurice Lam
a498083303 am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
* commit 'b3f69cd10435fdf2d799bafdde4949e70c1f84f1':
  [WifiSetup] Mechanism for suspending auto finish
2014-07-18 19:12:41 +00:00
Fabrice Di Meglio
39a2cbb32c Merge "Fix the way we select and apply Themes" into lmp-dev 2014-07-18 18:24:25 +00:00
Fabrice Di Meglio
84dfc0b5d6 Merge "Fix overdraw and do some layout optimizations" into lmp-dev 2014-07-18 18:24:25 +00:00
PauloftheWest
72e4a85b5a am 772cf206: Merge "Minor string fixes for translation" into lmp-dev
* commit '772cf2061685e5c7df4b1ebedd1249243cde6f74':
  Minor string fixes for translation
2014-07-18 18:12:45 +00:00
Andres Morales
5b452a1163 am 7ab8929c: On factory reset, wipe the stored account challenges
* commit '7ab8929cc6ecbd1ba14c0d6ecb393b31f9a6fcda':
  On factory reset, wipe the stored account challenges
2014-07-18 16:46:20 +00:00
Andres Morales
7ab8929cc6 On factory reset, wipe the stored account challenges
Each time a user adds an account, a challenge gets
stored to the persistent data block service.

If a user factory resets *from Settings*, this is
considered a "secure wipe" and thus we must wipe
the account challenges as well.

No other factory reset mechanism must be permitted
to wipe this data.

Bug: 14288780
Change-Id: Ibe48ccae2d7b5f8d736717a27b7c4f44bed0fba7
2014-07-18 16:40:37 +00:00
Amith Yamasani
66926227eb am d0a057cc: Merge "Improvements to user settings" into lmp-dev
* commit 'd0a057ccc89f65f0971a2e7c42758b0fedf7c501':
  Improvements to user settings
2014-07-18 15:02:03 +00:00
Alexandra Gherghina
527f0d2066 am 89265a30: Hide Settings launcher icon for a managed profile
* commit '89265a3026faad35107d6ef08f9a59f680819aaf':
  Hide Settings launcher icon for a managed profile
2014-07-18 11:22:36 +00:00
Alexandra Gherghina
a41da78efb am ccdc369e: Merge "Add account for managed user" into lmp-dev
* commit 'ccdc369e4772ed3d97508938861ee00457f8ba3e':
  Add account for managed user
2014-07-18 11:22:35 +00:00
Alexandra Gherghina
89265a3026 Hide Settings launcher icon for a managed profile
This makes the Settings icon disappear at the next reboot.

Bug: 16369104
Change-Id: Ic0a394413a0f2dc573d340394d2cd24388535856
2014-07-18 11:39:29 +01:00
Fabrice Di Meglio
c63f16ce0d am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
  Fix alignment of ActionBar title and Preferences for tablet UI
2014-07-18 02:43:49 +00:00
Fabrice Di Meglio
3bd0515242 Fix alignment of ActionBar title and Preferences for tablet UI
- use the correct start/end padding

See bug: #15439371 Visual add white BG for Settings Detail

Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
2014-07-17 19:36:14 -07:00
Tadashi G. Takaoka
740de4d39c am 3ac7802e: Fix duplicate string resources
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
  Fix duplicate string resources
2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
Michael Wright
87b69c3030 am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
  Add OP_PROJECT_MEDIA to AppOps
2014-07-17 22:03:58 +00:00
Tadashi G. Takaoka
721e63fc6d Merge "Remove unnecessary saved persistent preference" into lmp-dev 2014-07-17 21:58:28 +00:00
Tadashi G. Takaoka
3460a2683c Remove unnecessary saved persistent preference
This CL also fixes a bug in
InputMethodAndSubtypeUtil.updateSubtypesPreferenceChecked method that
prevents solving the issue/16115751.

Bug: 16115751
Change-Id: Ib46790172ed539d444fd609a1a97dabb2cb2d2f3
2014-07-18 18:21:44 -07:00
Maurice Lam
b3f69cd104 Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 2014-07-17 21:58:28 +00:00
Maurice Lam
6a627652cb [WifiSetup] Mechanism for suspending auto finish
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.

The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.

The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.

Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.

Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
2014-07-17 20:47:04 -07:00
PauloftheWest
772cf20616 Merge "Minor string fixes for translation" into lmp-dev 2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a Minor string fixes for translation
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
2014-07-18 11:04:13 -07:00