Fabrice Di Meglio
c63f16ce0d
am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
...
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
Fix alignment of ActionBar title and Preferences for tablet UI
2014-07-18 02:43:49 +00:00
Tadashi G. Takaoka
740de4d39c
am 3ac7802e: Fix duplicate string resources
...
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
Fix duplicate string resources
2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6
Fix duplicate string resources
...
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
Michael Wright
87b69c3030
am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
...
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
Add OP_PROJECT_MEDIA to AppOps
2014-07-17 22:03:58 +00:00
Fabrice Di Meglio
c08c67be88
Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
2014-07-17 21:58:28 +00:00
Fabrice Di Meglio
3bd0515242
Fix alignment of ActionBar title and Preferences for tablet UI
...
- use the correct start/end padding
See bug: #15439371 Visual add white BG for Settings Detail
Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
2014-07-17 19:36:14 -07:00
Paul Lawrence
2126ac9fa1
am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev
...
* commit 'eb0628bb02e5945acc0b5fe9da7082b279f043d6':
Final touches to material theme for phones
2014-07-17 21:04:25 +00:00
Michael Wright
b8a90e5042
Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
2014-07-17 21:04:20 +00:00
Zoltan Szatmary-Ban
ef8a48c85b
am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev
...
* commit 'cda76822c49ba80c8e1f2d000bb80058858f4712':
Update Location Settings for Enterprise
2014-07-17 20:16:28 +00:00
Chris Craik
4ce86a69a8
am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev
...
* commit 'dd82be9c705196d93986f356f464e6ebfed01002':
Access high contrast setting directly
2014-07-17 20:16:28 +00:00
Alexandra Gherghina
46ad810047
am c42d4059: Remove account for a managed user
...
* commit 'c42d4059b59848bef7bea550522e29d4ef95e18b':
Remove account for a managed user
2014-07-17 20:02:11 +00:00
Alexandra Gherghina
c42d4059b5
Remove account for a managed user
...
Bug: 16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
2014-07-17 19:57:43 +00:00
PauloftheWest
995448c76a
am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev
...
* commit '08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
Removed extraneous string from strings.xml
2014-07-17 19:53:19 +00:00
Alexandra Gherghina
84d719542d
am 7c81c1d1: Handle managing accounts for a managed profile
...
* commit '7c81c1d1afd57e61eb4b3000a952f95aa9782c64':
Handle managing accounts for a managed profile
2014-07-17 19:49:41 +00:00
Alexandra Gherghina
a4b48a956f
am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
...
* commit 'b8fff27ce349f5394b75925d9371857a518fa424':
Handle choosing and adding accounts for a managed profile
2014-07-17 19:45:36 +00:00
Zoltan Szatmary-Ban
cda76822c4
Merge "Update Location Settings for Enterprise" into lmp-dev
2014-07-17 19:45:26 +00:00
Zoltan Szatmary-Ban
925560e9a2
Update Location Settings for Enterprise
...
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.
Bug: 15467321
Change-Id: Ic52ed3d01a0816288d4818190e82befa5235f28b
2014-07-17 21:11:48 +01:00
Alexandra Gherghina
7c81c1d1af
Handle managing accounts for a managed profile
...
Bug: 15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
2014-07-17 19:42:46 +00:00
Dianne Hackborn
d0a947692d
am be875db5: Merge "Battery chart fixes." into lmp-dev
...
* commit 'be875db541d673aa62dd99acebc523a26018616e':
Battery chart fixes.
2014-07-17 19:25:51 +00:00
Amith Yamasani
26523d28ad
am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
...
* commit 'f1d56ebb111d10779b25f1105c3077cd9fd39890':
Follow split of DISALLOW_TELEPHONY
2014-07-17 19:21:46 +00:00
Paul Lawrence
eb0628bb02
Merge "Final touches to material theme for phones" into lmp-dev
2014-07-17 19:13:40 +00:00
Paul Lawrence
aa05738cd2
Final touches to material theme for phones
...
Fix layout
Improve text color/size
Improve edit box look
Hide status bar at top
Bug: 15328359
Change-Id: Ia0ea75c74b352963ccf47db0ff7c9684adc1f2a3
2014-07-17 13:29:23 -07:00
Amith Yamasani
0e1aaa0cc8
am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage.
...
* commit 'd888b543b2c188e59ea537ba4e73bf9253fbfc93':
Revert "Update Location Settings for Enterprise" due to build breakage.
2014-07-17 18:31:38 +00:00
Amith Yamasani
d888b543b2
Revert "Update Location Settings for Enterprise" due to
...
build breakage.
This reverts commit ca153c55dd .
Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
2014-07-17 18:26:38 +00:00
Zoltan Szatmary-Ban
fc9bf4b50b
am ca153c55: Update Location Settings for Enterprise
...
* commit 'ca153c55dda9e654f20cd21897fedf986bb95a2e':
Update Location Settings for Enterprise
2014-07-17 18:03:56 +00:00
Dianne Hackborn
be875db541
Merge "Battery chart fixes." into lmp-dev
2014-07-17 17:59:02 +00:00
Dianne Hackborn
c19eb361a4
Battery chart fixes.
...
When there is no data to show, don't make a crazy collapsed chart.
Also avoid re-creating the chart when scrolling.
And fix various other things.
Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
2014-07-17 12:09:54 -07:00
Zoltan Szatmary-Ban
ca153c55dd
Update Location Settings for Enterprise
...
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.
Bug: 15467321
Change-Id: Ib0fdb9f0c811307875296c37bab6d1fbab919022
2014-07-17 18:47:17 +01:00
Alan Viverette
a3fb9ceacc
am 5427b9a7: Update new TimePicker widget to match Settings theme
...
* commit '5427b9a7990d408df1f2231ec649501f848f7d3d':
Update new TimePicker widget to match Settings theme
2014-07-17 14:18:35 +00:00
Fabrice Di Meglio
4f9f25ac6c
am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
...
* commit '9b435f29d72d3be25c97ae3234ba375df055d09d':
Fix bug #15702424 add-wifi setting screen has no title
2014-07-17 14:15:47 +00:00
Baligh Uddin
28999ebb5f
am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'a1ed7f2f77f2518809bd369c236fb1d07fe2db6c':
Import translations. DO NOT MERGE
2014-07-17 14:15:46 +00:00
Alan Viverette
5427b9a799
Update new TimePicker widget to match Settings theme
...
BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6
2014-07-17 04:36:55 +00:00
Fabrice Di Meglio
e817a66e83
Fix bug #15702424 add-wifi setting screen has no title
...
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()
Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
2014-07-16 19:51:06 -07:00
Amith Yamasani
f1d56ebb11
Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
2014-07-17 02:40:09 +00:00
Amith Yamasani
920c57d499
Follow split of DISALLOW_TELEPHONY
...
Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.
Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
2014-07-17 11:03:41 -07:00
Chris Craik
dd82be9c70
Merge "Access high contrast setting directly" into lmp-dev
2014-07-17 02:34:24 +00:00
Chris Craik
22c7f58b65
Access high contrast setting directly
...
Change-Id: I6dd6359a9a0ed26955bbe7a9f24e460f85a17383
2014-07-17 11:15:49 -07:00
PauloftheWest
08ee22cb35
Merge "Removed extraneous string from strings.xml" into lmp-dev
2014-07-17 02:29:54 +00:00
PauloftheWest
44b6f51042
Removed extraneous string from strings.xml
...
Change-Id: I68db708eed866f644a2443bdc90582ae3e5c85eb
2014-07-17 12:49:19 -07:00
Alexandra Gherghina
b8fff27ce3
Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
2014-07-17 00:15:07 +00:00
Alexandra Gherghina
7d748c0267
Handle choosing and adding accounts for a managed profile
...
The user id can now be passed through the app as a fragment argument.
Bug: 15466880
Change-Id: I0e2be20551b4ec8c9226640ac74ea74115156ccd
2014-07-17 19:05:57 +00:00
Fabrice Di Meglio
a874180fbe
Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
...
- regression from 9717fab53d
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes
Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
2014-07-16 17:02:41 -07:00
Fabrice Di Meglio
9b435f29d7
Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
2014-07-16 23:30:53 +00:00
Baligh Uddin
a1ed7f2f77
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-16 23:30:53 +00:00
Baligh Uddin
c2befed25d
Import translations. DO NOT MERGE
...
Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7
Auto-generated-cl: translation import
2014-07-16 18:46:36 -07:00
Fabrice Di Meglio
b5b35fa1cf
Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev
2014-07-16 23:42:05 +00:00
Chris Craik
7babd05509
Merge "Accessibility text contrast control" into lmp-dev
2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7
Accessibility text contrast control
...
b/14624452
Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
2014-07-16 18:04:26 -07:00
Andres Morales
0128374aae
Increase oem_unlock_enable char limit for translation
...
Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854
2014-07-17 01:03:02 +00:00
Fabrice Di Meglio
7d79e41877
Fix OwnerInfos
...
- use a white background for being in line with the Material Theme
- fix padding so that the edge effect is showing full width
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a
2014-07-15 18:55:27 -07:00