Commit Graph

6356 Commits

Author SHA1 Message Date
Fabrice Di Meglio
02069663bc am c8c4b092: am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
* commit 'c8c4b092e99fb0349e5da4d58cd68ce55eb0c40d':
  Fix Notification Access layout for tabletUI support
2014-07-21 20:56:32 +00:00
Fabrice Di Meglio
6076eb0399 am edfe312d: am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
* commit 'edfe312d6de9f8adeca58c92b7447cd78a61a444':
  Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 18:37:01 +00:00
Fabrice Di Meglio
bc84cffff0 am a02a7be9: am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev
* commit 'a02a7be9dd8d56c959b76a1bd3296616f47dd474':
  Fix AppDetails padding on tablet UI
2014-07-21 18:06:00 +00:00
Jason Monk
08ac9bc606 am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
* commit '77fe5373826508345824927692fea942cf6a828a':
  Add Screen pinning back to settings
2014-07-21 17:28:47 +00:00
Przemyslaw Szczepaniak
b39af31668 am 892c3d31: am c0bffe71: Fix showing list of languages for picoTTS
* commit '892c3d31de11cad2639877322922fe745cd56f1e':
  Fix showing list of languages for picoTTS
2014-07-21 15:47:51 +00:00
Fabrice Di Meglio
fecda6181d Merge "Fix Notification Access layout for tabletUI support" into lmp-dev 2014-07-21 15:42:19 +00:00
Fabrice Di Meglio
20b32f25f0 Fix Notification Access layout for tabletUI support
- setup correct padding for the App list and its item

also remove showing FastScroller all the time on App Notification list

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

Change-Id: I11a70906f1372027622d50a81bc7744d48190f8a
2014-07-21 13:41:32 -07:00
Fabrice Di Meglio
dcf59dd82c Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
... and also crash with intent: android.settings.ACTION_OTHER_SOUND_SETTINGS

- add corresponding fragments to the ENTRY_FRAGMENTS array

Change-Id: Ic0c10841dfd7bc87d8573530129290ed172ff608
2014-07-21 11:22:20 -07: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
73e7cf4e3a am d49dd702: am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev
* commit 'd49dd702b1177062acefb8eae9720f2aaba1c028':
  Make TTS setting transition animation consistent.
2014-07-21 12:40:25 +00:00
Tadashi G. Takaoka
ddd69ec466 am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
* commit '05f5734cc52b9eed8880d95d395ae82e2856e0c3':
  Fix Settings behavior when disabling current IME
2014-07-20 18:07:56 +00:00
Tadashi G. Takaoka
a1fa80662c am ecf1b79f: am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
* commit 'ecf1b79f1622c526fb4dd86ed4f10fd8237a724e':
  Remove unnecessary saved persistent preference
2014-07-20 18:04:19 +00:00
Fabrice Di Meglio
8cd29142cc am 7ca153f1: am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
* commit '7ca153f11704f8c16195a4e03de81140c1ca0088':
  Fix Utils.prepareCustomPreferencesList()
2014-07-20 18:03:03 +00:00
Fabrice Di Meglio
a4eebd87d2 am 595b61eb: am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
* commit '595b61eb3921fead66fc163d33d835e5ba378e7f':
  Fix the way we select and apply Themes
2014-07-20 18:01:52 +00:00
Fabrice Di Meglio
182898133b am ce0e3008: am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
* commit 'ce0e3008e8e6726e51195f01591666dc7bebf7f3':
  Fix overdraw and do some layout optimizations
2014-07-20 17:59:33 +00: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
Adam Lesinski
3a2a4720c1 am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API
* commit '3becea17e7f9bc15005e013787392d0a11ea8b73':
  Update Settings to use new UsageStats API
2014-07-20 02:17:44 +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
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
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
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
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
Jeff Davidson
d1c3840ede am 2622bd75: am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev
* commit '2622bd759967810b06608682a664fa4478bd8fd2':
  Link WifiAssistant card with actual settings.
2014-07-18 22:09:14 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Maurice Lam
836e70f406 am a4980833: am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
* commit 'a498083303e08353574b551e4a236eb5251297b6':
  [WifiSetup] Mechanism for suspending auto finish
2014-07-18 19:18:48 +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
Andres Morales
7d6a6ebc81 am 5b452a11: am 7ab8929c: On factory reset, wipe the stored account challenges
* commit '5b452a11631338a12fc3ee09ca091c900fd7a8ba':
  On factory reset, wipe the stored account challenges
2014-07-18 16:52:06 +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
0e62c43d72 am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev
* commit '66926227ebabd856f872d12c22a11ffd748c48b0':
  Improvements to user settings
2014-07-18 15:06:05 +00:00
Alexandra Gherghina
ec2786a9b5 am 527f0d20: am 89265a30: Hide Settings launcher icon for a managed profile
* commit '527f0d2066dd976cf93485262c54c8e3f9ad4768':
  Hide Settings launcher icon for a managed profile
2014-07-18 11:45:43 +00:00
Alexandra Gherghina
17c9d3c92c am a41da78e: am ccdc369e: Merge "Add account for managed user" into lmp-dev
* commit 'a41da78efb6021bdf72809f2eae0ff86d2859f3e':
  Add account for managed user
2014-07-18 11:45:42 +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
Michael Wright
9292e27026 am 87b69c30: am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
* commit '87b69c303063321e871028ff713c26e200d32cc4':
  Add OP_PROJECT_MEDIA to AppOps
2014-07-18 00:32:08 +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
Zoltan Szatmary-Ban
dc2620425d am ef8a48c8: am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev
* commit 'ef8a48c85b8c9ff31e731c82f83bf183e4a8994b':
  Update Location Settings for Enterprise
2014-07-17 21:29:47 +00:00
Chris Craik
7c6c12f885 am 4ce86a69: am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev
* commit '4ce86a69a8b2c5d89b7e67c9aa08eda03961efb7':
  Access high contrast setting directly
2014-07-17 21:29:38 +00:00
Alexandra Gherghina
692b03c49e am 46ad8100: am c42d4059: Remove account for a managed user
* commit '46ad8100475c8bb2c5aa3ee7787674ef0669c634':
  Remove account for a managed user
2014-07-17 21:29:33 +00:00
Alexandra Gherghina
85d6818cf2 am 84d71954: am 7c81c1d1: Handle managing accounts for a managed profile
* commit '84d719542d430bd3e0074925629ae3d51fd561f9':
  Handle managing accounts for a managed profile
2014-07-17 21:29:23 +00:00
Jeff Davidson
878ca0edb9 Merge "Link WifiAssistant card with actual settings." into lmp-dev 2014-07-17 21:04:20 +00:00
Michael Wright
b8a90e5042 Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 2014-07-17 21:04:20 +00:00
Alexandra Gherghina
d8070b862b am a4b48a95: am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
* commit 'a4b48a956f3118c85f93123b1b85ca4abb7069dd':
  Handle choosing and adding accounts for a managed profile
2014-07-17 20:59:32 +00:00
Dianne Hackborn
8280f115ed am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev
* commit 'd0a947692de3e618fa4ed6a5f7f72c6714e088da':
  Battery chart fixes.
2014-07-17 20:59:13 +00:00
Amith Yamasani
06c8616291 am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
* commit '26523d28ad6bd14e30196a990a849c6ba5395177':
  Follow split of DISALLOW_TELEPHONY
2014-07-17 20:59:08 +00:00
Amith Yamasani
5c2ab1ea14 am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage.
* commit '0e1aaa0cc8a95d014314220c2453c6606f13428b':
  Revert "Update Location Settings for Enterprise" due to build breakage.
2014-07-17 20:58:49 +00:00