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
b666f1fd90
am 48aad314
: am 8610ff9e
: Merge "Fix Preferences background color" into lmp-dev
...
* commit '48aad314577d650a27d5d2c45b570f0845d889d9':
Fix Preferences background color
2014-07-25 03:07:18 +00: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
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
b0abf33f6c
am a757b61e
: am a8469d28
: Merge "More fixes for QuickLaunchSettings" into lmp-dev
...
* commit 'a757b61ec96eda097f67375621b23c797539d4dc':
More fixes for QuickLaunchSettings
2014-07-24 23:37:14 +00:00
Amith Yamasani
4069869e2c
am 156d1827
: am ee398747
: Refactor User Profile editor dialog for reuse
...
* commit '156d1827806d70060952f4d0d1752c455a7dcfbc':
Refactor User Profile editor dialog for reuse
2014-07-24 23:37:14 +00:00
rich cannings
c642e3d915
am 0ed8633f
: am b8684d57
: Remove "Verify apps" from Security settings
...
* commit '0ed8633fed9856c5f1baa6fac322eb03934d4d72':
Remove "Verify apps" from Security settings
2014-07-24 23:36:57 +00:00
Baligh Uddin
30765f497d
am c8f4e83d
: (-s ours) am c3bd8097
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c8f4e83de27af48cef4e49fd536e9fef3374c841':
Import translations. DO NOT MERGE
2014-07-24 23:36:02 +00:00
Paul Lawrence
a6ce40f461
am 4ea43465
: am 832ad720
: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
...
* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
Show countdown of remaining decrypt attempts before wiping device
2014-07-24 23:36:02 +00:00
Fabrice Di Meglio
c79ba3b870
am 997e93cc
: am 6cef9d23
: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
...
* commit '997e93cca483985d31236d66023bc83e24154ba1':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
2014-07-24 23:35:32 +00:00
Adam Lesinski
44b0c71d13
am 2c276024
: am 468d3916
: Implement the Usage Access Settings UI
...
* commit '2c27602438ce8a1d39c856e834b6405aa96d3218':
Implement the Usage Access Settings UI
2014-07-24 23:34:45 +00:00
PauloftheWest
bd1403f850
am 742dd6d4
: am 28fc05a1
: Merge "Added SIM Card Activity to Settings" into lmp-dev
...
* commit '742dd6d40603c424a161c68d70828180cf334533':
Added SIM Card Activity to Settings
2014-07-24 23:34:36 +00:00
PauloftheWest
38b2a89ee0
am ff455f40
: am 958d1ee6
: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
...
* commit 'ff455f40b6ed9f3781d5ea58be7d66c74e94a77c':
Fixed an illustrious NullPointer bug on Wifi Assistant
2014-07-24 23:33:57 +00:00
John Spurlock
06fbbf6f31
am 384ad06e
: am a8e0a5b5
: Merge "Settings: Add to the zen alarm string." into lmp-dev
...
* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
Settings: Add to the zen alarm string.
2014-07-24 23:31:18 +00:00
Paul Lawrence
40b8f46072
am 741bad53
: am e68f5224
: Show correct string when prompting for pattern before encrypting
...
* commit '741bad53a060700b639f4a061e0f63702224bb39':
Show correct string when prompting for pattern before encrypting
2014-07-24 23:31:06 +00:00
Alexandra Gherghina
6b68dba3b0
am 214712dd
: am 2513851a
: Adds cross-profile intents for Settings screens.
...
* commit '214712dda0a9ecea1af609b0e1029cbf627e73aa':
Adds cross-profile intents for Settings screens.
2014-07-24 23:30:49 +00:00
Alexandra Gherghina
26e2f3acff
am 2a459d30
: am 377b8df3
: Merge "Checks if the right user has a restriction" into lmp-dev
...
* commit '2a459d300850d98adf5d2d47f051e9a17d7c669e':
Checks if the right user has a restriction
2014-07-24 23:30:48 +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
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
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
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
Fabrice Di Meglio
459baaa9f5
am e2953d9f
: am 76f5c3bc
: Merge "More code cleaning for the Home intent filters" into lmp-dev
...
* commit 'e2953d9f5fcee4cb4d84911e3e7e0f75c521bfb2':
More code cleaning for the Home intent filters
2014-07-24 19:48:10 +00:00
Fabrice Di Meglio
24d06e1da4
am d2f47cc2
: am 87915ea0
: Merge "Code cleaning" into lmp-dev
...
* commit 'd2f47cc243ae64568f737023e450b03a40ea72c5':
Code cleaning
2014-07-24 19:47:58 +00:00
Fabrice Di Meglio
0a1732f961
am e0c5dd07
: am 456229cc
: Merge "Fix how Home Activities are refreshed" into lmp-dev
...
* commit 'e0c5dd07979b57940264f1b72957bd84ecb88740':
Fix how Home Activities are refreshed
2014-07-24 19:47:30 +00:00
Fabrice Di Meglio
482bcaf107
am b90ce51c
: am 1e9405b5
: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
...
* commit 'b90ce51c3dd222cc761d5bd01ffff2039b976224':
Add Settings Dashboard refresh for Home activities
2014-07-24 19:46:30 +00:00
Jim Miller
ab2b852cee
am 18be821a
: am dfd2c6f2
: Change wording in keyguard settings menu.
...
* commit '18be821acacd14cd7e8425c53095e8a2f4bd2b69':
Change wording in keyguard settings menu.
2014-07-24 19:46:26 +00:00
Maurice Lam
66336045c4
am 7fbde725
: am 56d781b3
: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
...
* commit '7fbde72593b42d452ac492c00845b097efa8f0b4':
[WifiSetup] Tablet landscape layout
2014-07-24 19:46:24 +00:00
Fabrice Di Meglio
3e55211042
am fd45a5c6
: am 56fc6a75
: Merge "Code cleaning for Index" into lmp-dev
...
* commit 'fd45a5c6352d734b7cf27e8da6e6f133f364612c':
Code cleaning for Index
2014-07-24 19:46:08 +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
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
935f97cd9b
Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
2014-07-24 16:04:26 +00: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