Alexandra Gherghina
cf330c41e4
am a97ee9a8: am aef3a97c: am 95b86a54: Refactoring useless UserUtils class
...
* commit 'a97ee9a837e794521cfd0d572c38032c9b3f3f13':
Refactoring useless UserUtils class
2014-07-28 12:14:17 +00:00
Tadashi G. Takaoka
8688246ca7
am b1567f53: am 5f3fea65: am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev
...
* commit 'b1567f53402df3601b7883642c0bb5b5c13d0564':
Preserve enabled subtypes across disabling and re-enabling an IME
2014-07-28 12:14:16 +00:00
Lajos Molnar
907e32b411
am 982bc06d: am 3e940224: am dc3bc0ba: Make nuplayer the default media player.
...
* commit '982bc06de6be0fb919b7495f02b96d8a347f5c9f':
Make nuplayer the default media player.
2014-07-28 12:14:15 +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
0bb12c257d
am f52c325f: am 666ff86d: am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
...
* commit 'f52c325f38868816da8b61d282d6f9d35146b775':
Show "up navigate" icon in input method subtype enabler
2014-07-28 02:47:10 +00:00
Amith Yamasani
1d54c06a24
am de2ead8f: am 44a0acfc: am 247520c3: More User Settings improvements
...
* commit 'de2ead8f67c0b7f6f053e428044b0862baeae75e':
More User Settings improvements
2014-07-26 14:22:32 +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
5fe72e8794
am 1302924b: am a078fe78: am 2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
...
* commit '1302924b63d507c77709bfd151e2d352915edf95':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
2014-07-26 01:59:10 +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
be192f46ad
am 6cab1e82: am 2799e639: am 096c0c46: Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
...
* commit '6cab1e826cf8e2d27142e1afa45b3bc376ff8fde':
Implement #15841213 Search - index Developer Option only and only if they have been activated
2014-07-25 23:59:11 +00:00
Fabrice Di Meglio
9b38520b9b
am c973fab0: am 68bf583d: 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 'c973fab0ca5f3ec90a2711c5424212e39f016d95':
Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:25:43 +00:00
Fabrice Di Meglio
4c7a058cf3
am d950abe9: am 83ce7d83: am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
...
* commit 'd950abe968b6d6a629b61f0bdb95373aaff65383':
Enforce the presence of the Indexable interface for Indexing
2014-07-25 19:25:37 +00:00
Amith Yamasani
17f51beb7a
am adbc1d32: am c5a80a98: am 2d578ce2: Don\'t use the profile info for name
...
* commit 'adbc1d32652fa3d496f6061e302ed0818f5eb1ac':
Don't use the profile info for name
2014-07-25 17:12:43 +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
71827c78ec
am b0abf33f: am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
...
* commit 'b0abf33f6cf617e5854dd801406bc98df4766eb0':
More fixes for QuickLaunchSettings
2014-07-24 23:41:33 +00:00
Amith Yamasani
409fbb738b
am 4069869e: am 156d1827: am ee398747: Refactor User Profile editor dialog for reuse
...
* commit '4069869e2cedefe0778af812cba760124445aada':
Refactor User Profile editor dialog for reuse
2014-07-24 23:41:33 +00:00
rich cannings
adc92594d4
am c642e3d9: am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings
...
* commit 'c642e3d915ba649702bddd9b6fe60d9210d0ccd0':
Remove "Verify apps" from Security settings
2014-07-24 23:41:32 +00:00
Paul Lawrence
5a67abbbdd
am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
...
* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
Show countdown of remaining decrypt attempts before wiping device
2014-07-24 23:41:30 +00:00
Fabrice Di Meglio
479f70cd02
am c79ba3b8: am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
...
* commit 'c79ba3b870048e9e0fd57a232bf5de71615735cd':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
2014-07-24 23:41:29 +00:00
Adam Lesinski
9bac84340b
am 44b0c71d: am 2c276024: am 468d3916: Implement the Usage Access Settings UI
...
* commit '44b0c71d1399ba24c2b85ae3272d97fcc3c854f5':
Implement the Usage Access Settings UI
2014-07-24 23:41:29 +00:00
PauloftheWest
5c416a6bf0
am bd1403f8: am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
...
* commit 'bd1403f85079958132427f523ee738ade98ca0f6':
Added SIM Card Activity to Settings
2014-07-24 23:41:27 +00:00
PauloftheWest
e774c8866b
am 38b2a89e: am ff455f40: am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
...
* commit '38b2a89ee06d1eba67e5c13e76d9ca22b41125b5':
Fixed an illustrious NullPointer bug on Wifi Assistant
2014-07-24 23:41:26 +00:00
Paul Lawrence
67a588bc43
am 40b8f460: am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting
...
* commit '40b8f46072ad242fc420d922cffb83b082e84894':
Show correct string when prompting for pattern before encrypting
2014-07-24 23:41:24 +00:00
Alexandra Gherghina
8061efef1e
am 6b68dba3: am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens.
...
* commit '6b68dba3b0721a5688e3933089b5879f1c804e12':
Adds cross-profile intents for Settings screens.
2014-07-24 23:41:24 +00:00
Alexandra Gherghina
a5476113d4
am 26e2f3ac: am 2a459d30: am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev
...
* commit '26e2f3acff6ffb814d0d839a96e0917f4ea5c8e1':
Checks if the right user has a restriction
2014-07-24 23:41:23 +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
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
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
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
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
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
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
Tadashi G. Takaoka
9a8b4f239f
Preserve enabled subtypes across disabling and re-enabling an IME
...
Bug: 16464156
Change-Id: I2ea4d010e47e5f48b2df11775b0c262330b28e89
2014-07-28 11:40:22 +09:00
Tadashi G. Takaoka
1671fbbc9d
Show "up navigate" icon in input method subtype enabler
...
Since API 16 (and API 14 with support library) and later, we started
supporting "up navigation" model.
http://developer.android.com/training/implementing-navigation/ancestral.html
As a part of Settings app and a part of an IME's settings activity,
the input method subtype enabler should have a "up navigate icon on
its action bar.
Bug: 16595009
Change-Id: Iaaadd970395b9c9254ab60b2e8fee22dffb8c7f6
2014-07-27 14:26:57 +09:00
Paul Lawrence
bd4c3210e1
Show countdown of remaining decrypt attempts before wiping device
...
Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
2014-07-24 08:38:24 -07:00
Fabrice Di Meglio
a8469d285e
Merge "More fixes for QuickLaunchSettings" into lmp-dev
2014-07-24 15:36:21 +00:00
PauloftheWest
958d1ee6d5
Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
2014-07-24 15:36:14 +00:00
PauloftheWest
63a1affdae
Fixed an illustrious NullPointer bug on Wifi Assistant
...
+ The class was never instantiated...
Bug: 16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b
2014-07-24 11:45:22 -07:00
Fabrice Di Meglio
a6dbeae65f
Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
2014-07-24 15:36:02 +00:00
Fabrice Di Meglio
6cef9d23b8
Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
2014-07-24 15:36:02 +00:00
Fabrice Di Meglio
9bf0ca9f2a
am 459baaa9: am e2953d9f: am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev
...
* commit '459baaa9f577a8ec641eca3581ab523b2cd4f695':
More code cleaning for the Home intent filters
2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
3cd4e5625c
am 24d06e1d: am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev
...
* commit '24d06e1da4a1c85574ae814e44aef9ef236f7c08':
Code cleaning
2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
ccf4cf33f7
am 0a1732f9: am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev
...
* commit '0a1732f9611f5099554bdc61c376556d33302949':
Fix how Home Activities are refreshed
2014-07-24 19:59:55 +00:00
Fabrice Di Meglio
74c842d31a
am 482bcaf1: am b90ce51c: am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
...
* commit '482bcaf10769cf1725e60dd76da8bcd358faa5c7':
Add Settings Dashboard refresh for Home activities
2014-07-24 19:59:53 +00:00