Commit Graph

15040 Commits

Author SHA1 Message Date
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
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
5c14856ba2 Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev 2014-07-25 23:01:28 +00:00
Fabrice Di Meglio
fb49019855 Fix bug #16306535 The arrows rotate in the opposite direction...
of the direction implied by the iconography (clockwise)

- update assets with correct direction

Change-Id: I56ff28cd2207577726b5136191317fae325c1bed
2014-07-29 17:08:41 -07:00
Fabrice Di Meglio
6911f9cf63 Fix bug #16660819 Switchbar text should be white not grey
- use "?android:attr/textColorPrimary" so that we are white
and matching the color of the Activity Title

Change-Id: I18bc47d2080fcc171b86e5b56bfc86bbe8637caa
2014-07-29 16:54:44 -07:00
Fabrice Di Meglio
6d9a59f02d Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 2014-07-25 23:01:28 +00:00
Amith Yamasani
ba9643b92c Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
b8e0f608cf Implement SET_PROFILE_OWNER intent
This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.

Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.

Also, make sure that profile owners cannot be deactivated.

Bug: 16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
2014-07-29 13:50:40 -07:00
Fabrice Di Meglio
db7d2d16b1 Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev 2014-07-25 21:16:23 +00:00
Fabrice Di Meglio
54bac5f2c6 Merge "Fix App Info padding" into lmp-dev 2014-07-25 21:16:23 +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
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
c973fab0ca 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 '68bf583d86aef6caed512ad7720f142e6284ed81':
  Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:21:07 +00: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
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
Alan Viverette
29850a82d0 am ab01ab4c: am 869d18af: am 06363397: Remove -opia color correction modes
* commit 'ab01ab4c4df86c8106f7806c9afde8e2c5ae92bc':
  Remove -opia color correction modes
2014-07-25 19:54:21 +00:00
Alan Viverette
ab01ab4c4d am 869d18af: am 06363397: Remove -opia color correction modes
* commit '869d18af2d0472f014513a2e2570c1e989bfac38':
  Remove -opia color correction modes
2014-07-25 19:50:50 +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
d8e4b338e4 am 72c677c4: am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout
* commit '72c677c4590b098bf53b3d319fa4d007b5affb76':
  Fix Trusted Credentials layout
2014-07-25 19:25:38 +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
Paul Lawrence
72c677c459 am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout
* commit '54579a9ef347f8948c86719f459c8b330f81d670':
  Fix Trusted Credentials layout
2014-07-25 19:18:41 +00:00
Fabrice Di Meglio
d950abe968 am 83ce7d83: am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
* commit '83ce7d83c1308811086b187eaea1558f5bd6152a':
  Enforce the presence of the Indexable interface for Indexing
2014-07-25 19:18:40 +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
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
adbc1d3265 am c5a80a98: am 2d578ce2: Don\'t use the profile info for name
* commit 'c5a80a987d5f5d5b8efa2e51179f45c272a738de':
  Don't use the profile info for name
2014-07-25 16:50:56 +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
a1e01f0e41 am b666f1fd: am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
* commit 'b666f1fd9062c64b8294bcd19d19e2ff7b0a17e5':
  Fix Preferences background color
2014-07-25 03:11:26 +00: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
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
Baligh Uddin
4ad7fa45e4 am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '30765f497de684d72287fd26e1cc9696f8ac9617':
  Import translations. DO NOT MERGE
2014-07-24 23:41:31 +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
John Spurlock
159af1cb3f am 06fbbf6f: am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
* commit '06fbbf6f313c161980f2d28d81b19942a9adb306':
  Settings: Add to the zen alarm string.
2014-07-24 23:41:25 +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
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