Commit Graph

14606 Commits

Author SHA1 Message Date
Alexandra Gherghina
aef3a97c86 am 95b86a54: Refactoring useless UserUtils class
* commit '95b86a5488a27d95bda8b6db1f608d6ce55dae8a':
  Refactoring useless UserUtils class
2014-07-28 11:59:19 +00:00
Tadashi G. Takaoka
5f3fea6572 am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev
* commit '72f7072328539d58ba02a6851e9e292a750f7d20':
  Preserve enabled subtypes across disabling and re-enabling an IME
2014-07-28 11:58:59 +00:00
Lajos Molnar
3e9402244e am dc3bc0ba: Make nuplayer the default media player.
* commit 'dc3bc0ba6be006c89b9674cdcc23b3972b7b1052':
  Make nuplayer the default media player.
2014-07-28 11:58:57 +00:00
Alexandra Gherghina
95b86a5488 Refactoring useless UserUtils class
Bug: 16542609
Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b
2014-07-28 07:40:48 +00:00
Lajos Molnar
dc3bc0ba6b Make nuplayer the default media player.
Update nuplayer settings to use awesomeplayer key.

Bug: 11784824
Change-Id: I25ec4b4bd289e3f00c3d299b1a3a5275d1ba73fe
2014-07-27 21:59:18 -07:00
Tadashi G. Takaoka
666ff86d85 am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
* commit '935f97cd9bc38fefc5b3358a2151440b85c54c32':
  Show "up navigate" icon in input method subtype enabler
2014-07-28 02:39:53 +00:00
Amith Yamasani
5573c5e3cd am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
  Increase string lengths for translation
2014-07-27 11:30:12 +00:00
Amith Yamasani
ee4e67aa27 am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
* commit '1a77577da755b0921a3b77fc66ff9b99b50b59f6':
  Change tablet to device so it doesn't say tablet on a phone
2014-07-26 23:57:25 +00:00
Amith Yamasani
1a77577da7 Change tablet to device so it doesn't say tablet on a phone
Bug: 16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552
2014-07-26 16:47:00 -07:00
Amith Yamasani
44a0acfcb6 am 247520c3: More User Settings improvements
* commit '247520c369370885a1c085e53ee679dce0fd55ce':
  More User Settings improvements
2014-07-26 14:16:15 +00:00
Amith Yamasani
247520c369 More User Settings improvements
Add a menu checkbox to allow creation of users from lockscreen.
Add a delete icon in restricted profiles settings.
Other little fixes to icons.
Update some strings based on feedback.

Bug: 15761405
Bug: 16550371
Bug: 16298824

Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
2014-07-26 14:09:43 +00:00
Maurice Lam
a078fe7842 am 2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
* commit '2d4d9a9067a2904ed75247f83b0f37a086a020b2':
  [WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
2014-07-26 01:49:37 +00:00
Maurice Lam
2d4d9a9067 [WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
Do not create the assistant card if we are in WifiPickerActivity,
which includes setup wizard and account login.

Bug: 16382431
Change-Id: Id5eaa8040eafe5222e1a5c9276a2a10bedebfd71
2014-07-25 17:55:49 -07:00
Fabrice Di Meglio
2799e6394c am 096c0c46: Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
* commit '096c0c46fb8cbdfeb05cdfb19d8c98b06403a18d':
  Implement #15841213 Search - index Developer Option only and only if they have been activated
2014-07-25 23:49:24 +00:00
Amith Yamasani
bed3a7b6aa Merge "Increase string lengths for translation" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
1a4c1b080c Increase string lengths for translation
Bug: 16062154
Change-Id: Ib0086f23283f324a18f71ec5f8bab9275567c59f
2014-07-26 22:54:40 -07:00
Fabrice Di Meglio
68bf583d86 am a6dbeae6: Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
* commit 'a6dbeae65f3c7e924adf5027469064660ba9e825':
  Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:17:20 +00:00
Alan Viverette
869d18af2d am 06363397: Remove -opia color correction modes
* commit '063633971283a2dd342fc032d3cef65d03de0125':
  Remove -opia color correction modes
2014-07-25 19:46:56 +00:00
Alan Viverette
0636339712 Remove -opia color correction modes
The implementations for these are identical to -omaly modes.

Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
2014-07-25 19:41:04 +00:00
Paul Lawrence
54579a9ef3 am 0ee45d5b: Fix Trusted Credentials layout
* commit '0ee45d5bdc559ba7746dc803429268e8b6dd2092':
  Fix Trusted Credentials layout
2014-07-25 18:47:41 +00:00
Fabrice Di Meglio
83ce7d83c1 am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
* commit 'dec811201f079a48e357f99532996b42406fd5af':
  Enforce the presence of the Indexable interface for Indexing
2014-07-25 18:47:40 +00:00
Paul Lawrence
0ee45d5bdc Fix Trusted Credentials layout
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape

Bug: 16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
2014-07-25 18:20:52 +00:00
Amith Yamasani
c5a80a987d am 2d578ce2: Don\'t use the profile info for name
* commit '2d578ce29391dc72fde7330ff9ff909347ec531b':
  Don't use the profile info for name
2014-07-25 16:46:48 +00:00
Amith Yamasani
2d578ce293 Don't use the profile info for name
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.

Bug: 15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
2014-07-25 09:37:33 -07:00
Fabrice Di Meglio
48aad31457 am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
* commit '8610ff9ea678201920bf6fb7d3a2b141226f6640':
  Fix Preferences background color
2014-07-25 03:03:43 +00:00
Fabrice Di Meglio
a757b61ec9 am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
* commit 'a8469d285e1956e2a90a4475ad6e5981dee34223':
  More fixes for QuickLaunchSettings
2014-07-24 23:23:55 +00:00
Amith Yamasani
156d182780 am ee398747: Refactor User Profile editor dialog for reuse
* commit 'ee3987475e1d29e8355bdb9e068149eb01e3fd43':
  Refactor User Profile editor dialog for reuse
2014-07-24 23:23:54 +00:00
Amith Yamasani
ee3987475e Refactor User Profile editor dialog for reuse
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.

Bug: 15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
2014-07-24 23:13:34 +00:00
rich cannings
0ed8633fed am b8684d57: Remove "Verify apps" from Security settings
* commit 'b8684d573e1357ee573f26d511a630b39e368d0f':
  Remove "Verify apps" from Security settings
2014-07-24 22:47:13 +00:00
Fabrice Di Meglio
096c0c46fb Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev 2014-07-24 22:43:15 +00:00
Fabrice Di Meglio
2ec78636f7 Implement #15841213 Search - index Developer Option only and only if they have been activated
- do not index Developer Options if they are not activated
- index them just after their activation

Change-Id: I54fcc6b55a1f29eb6b19d6e14e3158d4a38a6fe6
2014-07-25 16:28:53 -07:00
Fabrice Di Meglio
b7bd72f297 Fix bug #16533532 Settings app crashes on device orientation change
...when "change language" warning dialog is on screen

- try harder at getting the parent fragment. First try by calling
getParentFragment() and if this is getting a null reference, try
again by using the fragment Id saved during onSaveInstanceState()

Change-Id: I3dbc6a229224c8770ff2c7e432e76b8796c4b099
2014-07-25 13:03:09 -07:00
Fabrice Di Meglio
9a60d7b569 Enforce the presence of the Indexable interface for Indexing
- check that the Indexable interface has been defined before indexing

Change-Id: Ia61915b2bd1240226ba560ecfd883a115b49da95
2014-07-24 19:53:47 -07:00
Fabrice Di Meglio
1bf89b742d Fix Preferences background color
- use #FFFAFAFA instead of pure white

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

Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
2014-07-24 17:03:04 -07:00
Fabrice Di Meglio
e20e169bbe More fixes for QuickLaunchSettings
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme

Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
2014-07-24 15:46:35 -07:00
Fabrice Di Meglio
dec811201f Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev 2014-07-24 22:43:15 +00:00
rich cannings
b8684d573e Remove "Verify apps" from Security settings
The setting moved to Google settings

Bug: 15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
2014-07-24 15:13:23 -07:00
Fabrice Di Meglio
8610ff9ea6 Merge "Fix Preferences background color" into lmp-dev 2014-07-24 22:06:48 +00:00
Baligh Uddin
c8f4e83de2 am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
  Import translations. DO NOT MERGE
2014-07-24 21:52:43 +00:00
Paul Lawrence
4ea43465fa am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
* commit '832ad7206299be6db94e82e2387c0fcf8df53e7e':
  Show countdown of remaining decrypt attempts before wiping device
2014-07-24 21:52:43 +00:00
Fabrice Di Meglio
997e93cca4 am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
* commit '6cef9d23b8572d8bd87329999f10286e29a861c0':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
2014-07-24 21:26:47 +00:00
Fabrice Di Meglio
e3ff4d8e92 Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
2014-07-24 14:07:02 -07:00
Baligh Uddin
c3bd8097d8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Baligh Uddin
1de9e58b20 Import translations. DO NOT MERGE
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
2014-07-24 21:44:52 +00:00
Paul Lawrence
832ad72062 Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 2014-07-24 20:48:02 +00:00
Adam Lesinski
2c27602438 am 468d3916: Implement the Usage Access Settings UI
* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
  Implement the Usage Access Settings UI
2014-07-24 20:30:37 +00:00
Adam Lesinski
468d39160f Implement the Usage Access Settings UI
Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.

Bug: 16461070

Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9
2014-07-24 13:24:19 -07:00
PauloftheWest
742dd6d406 am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
* commit '28fc05a12bc26c79be697c347dd2930094900744':
  Added SIM Card Activity to Settings
2014-07-24 20:02:57 +00:00
PauloftheWest
ff455f40b6 am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
* commit '958d1ee6d584b7489d57071305c44635a0534ba9':
  Fixed an illustrious NullPointer bug on Wifi Assistant
2014-07-24 18:51:10 +00:00
Tadashi G. Takaoka
72f7072328 Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev 2014-07-24 16:04:26 +00:00