Fabrice Di Meglio
ca99afb57a
am fc14e272
: Merge "Update Settings App icons" into lmp-dev
...
* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
Update Settings App icons
2014-09-30 19:50:30 +00:00
Fabrice Di Meglio
fc14e272aa
Merge "Update Settings App icons" into lmp-dev
2014-09-30 19:45:31 +00:00
PauloftheWest
c0d0a208e4
am 29aab7a2
: Fixed a Settings crash.
...
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
2014-09-30 15:54:51 +00:00
Fabrice Di Meglio
85f76f3a7d
Update Settings App icons
...
Per UX request
See bug: #17703962 update Settings app icons
Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
2014-09-29 19:17:56 -07:00
PauloftheWest
29aab7a2ad
Fixed a Settings crash.
...
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.
Bug: 17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
2014-09-29 14:58:27 -07:00
Baligh Uddin
08a08b344b
am 5c664d8e
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
Import translations. DO NOT MERGE
2014-09-29 20:40:37 +00:00
PauloftheWest
6dfb48bf48
am 709ddd5c
: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
Fixed multiple MAP issues.
2014-09-29 20:40:36 +00:00
Baligh Uddin
5c664d8e20
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:37:22 +00:00
PauloftheWest
709ddd5c24
Merge "Fixed multiple MAP issues." into lmp-dev
2014-09-29 15:10:23 +00:00
Baligh Uddin
a69eafa6c8
Import translations. DO NOT MERGE
...
Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import
2014-09-29 00:31:03 -07:00
Robert Greenwalt
4670af5327
am ce77a43a
: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
...
* commit 'ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf':
ATT Entitlement changes in Settings to pass Tether Type.
2014-09-27 00:13:40 +00:00
Robert Greenwalt
ce77a43abf
Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
2014-09-27 00:09:02 +00:00
Elliott Hughes
c9482dd9d6
am ed6a6ca0
: Make the system locale available to the decryption UI.
...
* commit 'ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
Make the system locale available to the decryption UI.
2014-09-26 22:58:57 +00:00
Elliott Hughes
ed6a6ca026
Make the system locale available to the decryption UI.
...
Bug: 17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
2014-09-26 15:17:35 -07:00
Rohit Sisodia
37155e9633
ATT Entitlement changes in Settings to pass Tether Type.
...
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.
Bug:17640036
Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
2014-09-26 15:09:03 -07:00
Alexandra Gherghina
e4b18b7994
am 9de68440
: Merge "Match parent width for user spinner to fix tint" into lmp-dev
...
* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
Match parent width for user spinner to fix tint
2014-09-26 21:57:19 +00:00
Alexandra Gherghina
8e4be6afb4
am 3c3ceb9d
: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
...
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter
2014-09-26 21:57:18 +00:00
Alexandra Gherghina
9de68440a9
Merge "Match parent width for user spinner to fix tint" into lmp-dev
2014-09-26 17:53:28 +00:00
Alexandra Gherghina
3c3ceb9d42
Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
2014-09-26 17:42:49 +00:00
PauloftheWest
2af51dbcfe
am 3aabfca4
: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
...
* commit '3aabfca462af26c487d2a834f70d0998d7556637':
Fixed a crash when rotating a WPS dialog.
2014-09-26 14:54:31 +00:00
PauloftheWest
3aabfca462
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
2014-09-26 14:47:28 +00:00
Michael Wright
2e0d4080ee
am 1b87bec5
: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
...
* commit '1b87bec5de17dc23cf63d9f71358b8c979f8c896':
If a device identifier is specified, bring up keyboard layouts dialog.
2014-09-25 23:44:01 +00:00
Michael Wright
1b87bec5de
Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
2014-09-25 22:18:34 +00:00
PauloftheWest
a7d31e8164
Fixed a crash when rotating a WPS dialog.
...
Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
2014-09-25 12:36:09 -07:00
Zoltan Szatmary-Ban
2d9cbcea03
am a2b7bb6b
: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
...
* commit 'a2b7bb6be612fc050fc7634815a614f84fcac778':
Make Force Stop button work for packages of managed profile
2014-09-25 10:46:33 +00:00
Zoltan Szatmary-Ban
8812d97393
am 7258650e
: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
...
* commit '7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity
2014-09-25 10:46:32 +00:00
Zoltan Szatmary-Ban
a2b7bb6be6
Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
2014-09-25 10:38:40 +00:00
Zoltan Szatmary-Ban
7258650efd
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
2014-09-25 10:35:58 +00:00
Alexandra Gherghina
e4124f4743
Match parent width for user spinner to fix tint
...
Bug: 17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
2014-09-25 11:29:17 +01:00
Alexandra Gherghina
7d3b6b4703
Use plain user icon in UserSpinnerAdapter
...
Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.
Bug: 17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
2014-09-25 11:07:42 +01:00
Alexandra Gherghina
4bda5d6e25
am eac7cc5e
: Merge "Add null check for sync authorities of an account type" into lmp-dev
...
* commit 'eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
Add null check for sync authorities of an account type
2014-09-25 09:48:39 +00:00
Alexandra Gherghina
eac7cc5eea
Merge "Add null check for sync authorities of an account type" into lmp-dev
2014-09-25 09:37:58 +00:00
Jeff Sharkey
7c8e48703b
am d642d1ab
: Merge "Include reason when wiping data." into lmp-dev
...
* commit 'd642d1abcfed427e4c152e28e39b50cdb68b81c6':
Include reason when wiping data.
2014-09-24 23:35:40 +00:00
Jeff Sharkey
d642d1abcf
Merge "Include reason when wiping data." into lmp-dev
2014-09-24 23:28:00 +00:00
Paul Lawrence
7af02e13bf
am 29df3796
: Merge "Hide controls once password is known good" into lmp-dev
...
* commit '29df37969794aa4db73af0d0fdbcde273aef5ab2':
Hide controls once password is known good
2014-09-24 23:06:41 +00:00
PauloftheWest
00656b8e46
Fixed multiple MAP issues.
...
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.
Bug: 17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
2014-09-24 16:06:16 -07:00
Paul Lawrence
29df379697
Merge "Hide controls once password is known good" into lmp-dev
2014-09-24 22:59:08 +00:00
Jeff Sharkey
1de688d911
Include reason when wiping data.
...
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
2014-09-24 14:08:05 -07:00
Adrian Roos
98d94401fa
am 6d5c75f6
: Prevent saving credentials multiple times
...
* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
Prevent saving credentials multiple times
2014-09-24 17:50:13 +00:00
Adrian Roos
6d5c75f6cd
Prevent saving credentials multiple times
...
Bug: 17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
2014-09-24 15:28:12 +02:00
Alexandra Gherghina
7f279cef11
Add null check for sync authorities of an account type
...
This protects against a potential NPE if there are no sync authorities for
an account of a given type.
Bug: 17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
2014-09-24 12:33:39 +01:00
Zoltan Szatmary-Ban
d50c7a8878
Start PowerUsageDetails fragment in the correct activity
...
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.
Bug:17523189
Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
2014-09-24 12:33:33 +01:00
Alan Viverette
c0277ea2cf
am c394e380
: am 3156e38f
: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
...
* commit 'c394e380c5773d257a7b99d22575ca242ab868bc':
Fix background colors to point directly to theme attribute
2014-09-24 02:26:34 +00:00
Alan Viverette
c394e380c5
am 3156e38f
: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
...
* commit '3156e38f5ec788048439a401ea5f5012e11ea2a7':
Fix background colors to point directly to theme attribute
2014-09-24 01:45:02 +00:00
Alan Viverette
3156e38f5e
Merge "Fix background colors to point directly to theme attribute" into lmp-dev
2014-09-24 01:25:07 +00:00
Alan Viverette
f81f72ffed
Fix background colors to point directly to theme attribute
...
BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
2014-09-23 18:14:54 -07:00
Fabrice Di Meglio
8c3f35a659
am 5fe578d8
: am a1c6a0c8
: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
...
* commit '5fe578d8fdd161cad9d5fcc99fdb157e47fe8771':
Fix bug #17594602 Battery Usage refresh icon needs updating
2014-09-24 00:17:21 +00:00
Fabrice Di Meglio
5fe578d8fd
am a1c6a0c8
: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
...
* commit 'a1c6a0c895f6d580bebfb714c7930f5ec015770d':
Fix bug #17594602 Battery Usage refresh icon needs updating
2014-09-24 00:09:03 +00:00
Fabrice Di Meglio
a1c6a0c895
Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
2014-09-23 23:58:59 +00:00
Fabrice Di Meglio
6a5ebf5fef
Fix bug #17594602 Battery Usage refresh icon needs updating
...
- use the correct Framework asset for "refresh"
Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
2014-09-23 16:17:00 -07:00