Chris Wren
38f650818a
am 413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
...
* commit '413edd50540a7890949c5370d18f293f2e6f8841':
Disable the attention light on devices that do not have it.
2014-06-05 18:00:02 +00:00
Chris Wren
5116a821b9
Disable the attention light on devices that do not have it.
...
If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.
Bug: 12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
2014-06-05 12:38:13 -04:00
Kenny Guy
d0969135aa
Merge "Badge notification from managed profiles."
2014-06-05 14:20:35 +00:00
Selim Cinek
d467c9e543
am 995006df: Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
...
* commit '995006dfe6e41c8d986c7c7af5bb02ff23e4429a':
Changed the default success color of the lockpatternview to white.
2014-06-05 13:45:59 +00:00
Selim Cinek
63c8b6c325
am 71ea5814: Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
...
* commit '71ea5814716a191b3ab2bc9045007865cbad3e34':
Changed the LockPatternView assets to quantum
2014-06-05 13:45:58 +00:00
Dan Sandler
138a7aea27
am 8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
...
* commit '8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
Platlogo: The icon now matches the activity.
2014-06-05 09:47:47 +00:00
Selim Cinek
7256a852ce
Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
2014-06-05 05:36:22 +00:00
Selim Cinek
bd8deb0e3b
Changed the default success color of the lockpatternview to white.
...
Since it was distracting when unlocking
Bug: 13735707
Change-Id: I6b9c5baa22dc5c102f36bdf9a99390c5dd1690ba
2014-06-05 07:25:01 +02:00
Selim Cinek
35066c385f
Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
2014-06-05 05:03:11 +00:00
Selim Cinek
2cb687e7b9
Changed the LockPatternView assets to quantum
...
Bug: 13735707
Change-Id: Id999adbd8a4aeb3ca91fcb9957ec38ec75ff91b0
2014-06-05 06:59:08 +02:00
Dan Sandler
c03f429b9f
Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
2014-06-05 02:26:40 +00:00
Amith Yamasani
f12d4afb85
Merge "Change preference category text color for quantum"
2014-06-04 23:44:30 +00:00
Raph Levien
47b24f9c93
am 424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
...
* commit '424f369a38371294fdf3fc8d769ae9ca1e790807':
Turn off elegantTextHeight in quantum theme
2014-06-04 23:42:57 +00:00
Raph Levien
cbc9a679d8
Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
2014-06-04 23:28:47 +00:00
Alan Viverette
c740ffa3c6
am c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
...
* commit 'c1462be80a2581ddd522bf24d91ba183f166de80':
Update ripple spec, fix ripple mask, rotate progress drawable
2014-06-04 23:26:57 +00:00
Raph Levien
c499e97667
Turn off elegantTextHeight in quantum theme
...
Setting elegantTextHeight to true was a great experiment, but it led to
too much difficulty getting text to fit in space-constrained spaces
(action bar, list items). A long term solution is optical bounds, but
for the time being, just turn it off.
This patch fixes bug 14227056: "Language name displaying under Personal
dictionary are truncated in landscape mode"
Change-Id: I2b0e1ca2e7a06cd0fd9a4d84c1c07fdea2ddbf03
2014-06-04 16:09:11 -07:00
Amith Yamasani
e1b74ec318
Change preference category text color for quantum
...
Use the colorAccent theme attribute.
Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
2014-06-04 15:51:41 -07:00
Alan Viverette
b996d809bf
Update ripple spec, fix ripple mask, rotate progress drawable
...
Change-Id: I4fc155bf2f12d9f324c354dee81479f9cddafac4
2014-06-04 14:35:42 -07:00
Fabrice Di Meglio
838c580a10
am 60a6c7f5: Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev
...
* commit '60a6c7f59b3ae3c014211753162b2370e61e70d4':
Update permissions assets for Quantum Theme
2014-06-04 21:32:00 +00:00
Eric Laurent
aaa688972a
am 25d7a394: Merge "add permission for AudioManager routing APIs." into lmp-preview-dev
...
* commit '25d7a394c0cf91d9e9711d3f36913f4ed8aa91d8':
add permission for AudioManager routing APIs.
2014-06-04 21:31:49 +00:00
George Mount
14ec02afa0
am 46e2688a: Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev
...
* commit '46e2688a20758d8529ccd3da83a0fcbbf3e8b5fb':
Create reasonable Activity Transition defaults for quantum theme.
2014-06-04 20:51:52 +00:00
Dan Sandler
d2b0b3b487
Platlogo: The icon now matches the activity.
...
Also tweaked ADB a little. It's just a preview!
Change-Id: I95265400c29272b7ff0593710ed41978e3e53df1
2014-06-04 16:23:11 -04:00
Adrian Roos
b4df2f586a
am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
...
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
Ensure trust agents are only provided by platform packages
2014-06-04 20:04:55 +00:00
Fabrice Di Meglio
b223ab1b43
Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev
2014-06-04 18:54:08 +00:00
Fabrice Di Meglio
318875bbcf
Update permissions assets for Quantum Theme
...
See bug: #14258811 Permissions icons are not visible in App info
Change-Id: I7167b636093cf56e3443fb46c89d693ba50eb59c
2014-06-04 11:51:07 -07:00
Alan Viverette
7820b7bf5d
am 4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev
...
* commit '4dd60289af766c9a256b57a3d1a8662131d28230':
Fix RadialTimePicker styling
2014-06-04 18:45:24 +00:00
Adam Powell
0662025216
am 379b49bb: Fix some brain itch.
...
* commit '379b49bbc5088320d6f8f2fce88a70b458e80cf7':
Fix some brain itch.
2014-06-04 18:45:19 +00:00
Alan Viverette
90efa8f08c
am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev
...
* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
Fix action bar menu inflation context
2014-06-04 18:45:10 +00:00
Alan Viverette
3b1e08fc9f
am 62ea9554: Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev
...
* commit '62ea9554753820df25343e52e0dcab090e5755b5':
Temporary drawable for Quantum progress indicator
2014-06-04 18:44:09 +00:00
Alan Viverette
8a3e0a5c0b
am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev
...
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
Fix build, fix Drawable loop
2014-06-04 18:43:23 +00:00
Alan Viverette
22b893fde1
Merge commit '096d52fb' into manualmerge
...
Conflicts:
api/current.txt
Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
2014-06-04 11:42:06 -07:00
Eric Laurent
94236c56dd
Merge "add permission for AudioManager routing APIs." into lmp-preview-dev
2014-06-04 18:10:25 +00:00
Adrian Roos
14830a332f
Merge "Hide TrustAgentService in lmp-preview - DO NOT MERGE" into lmp-preview-dev
2014-06-04 18:10:03 +00:00
Alan Viverette
62c5c1bd55
am 4d75314b: Merge "Quantum tab indicators, clean up text appearances" into lmp-preview-dev
...
* commit '4d75314b5b03cacffddcd15aea7b5172f89b0512':
Quantum tab indicators, clean up text appearances
2014-06-04 18:09:21 +00:00
Alan Viverette
1fa8b11d93
am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev
...
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
Fix drawable cache, add quantum assets to preload list
2014-06-04 18:09:14 +00:00
Wei Wang
2fabda1906
am 283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev
...
* commit '283a223371df58274fdc4380f9710511775eecc5':
Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925.
2014-06-04 17:02:02 +00:00
Adrian Roos
b803ad3c2c
Hide TrustAgentService in lmp-preview - DO NOT MERGE
...
Bug: 15287044
Change-Id: Iba0d53b87bcb4bddccec89cf943ed65491aa9d76
2014-06-04 15:04:19 +00:00
George Mount
155ce3aeb1
Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev
2014-06-04 14:15:48 +00:00
Adrian Roos
1e9021aef8
Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
2014-06-04 13:18:40 +00:00
Baligh Uddin
08dede77d8
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-04 04:40:42 +00:00
Baligh Uddin
e3ceca2cf9
Merge "Import translations. DO NOT MERGE"
2014-06-04 04:40:39 +00:00
Alan Viverette
07bfc4ba2e
Merge "Fix RadialTimePicker styling" into lmp-preview-dev
2014-06-04 01:43:21 +00:00
Adam Powell
0d523cc394
Fix some brain itch.
...
Set a default start content inset for quantum action bars.
Change-Id: I97f8b07b52b3afed265691d48caaeb6c54c95f78
2014-06-03 18:39:33 -07:00
Alan Viverette
eb1d3798e3
Fix RadialTimePicker styling
...
Also sneaks in some whitespace cleanup for PhoneWindow!
Change-Id: I1bc8a889a59d69ae80b6cfbf54d57cd7f8ad4a36
2014-06-03 18:36:03 -07:00
Alan Viverette
ef8f79a928
Merge "Fix action bar menu inflation context" into lmp-preview-dev
2014-06-04 01:17:25 +00:00
Eric Laurent
01fae55d17
add permission for AudioManager routing APIs.
...
Add signature or system permission
"android.permission.MODIFY_AUDIO_ROUTING" for AudioManager APIs
allowing system services and applications to modify audio routing.
Bug: 14815883.
Change-Id: If09f6f3a166a6b2f3761b65dbde0c86873850f07
2014-06-04 01:07:53 +00:00
Alan Viverette
4b002d3251
Fix action bar menu inflation context
...
Change-Id: I9da159d7721f41974b711e74edbaba6d6740f183
2014-06-03 17:32:19 -07:00
George Mount
e5fcc9b441
Create reasonable Activity Transition defaults for quantum theme.
...
Bug 15390838
Change-Id: I55c2138176bd00074aa0320a64c3e595d9b9ea13
2014-06-03 17:31:14 -07:00
Alan Viverette
bb938107b7
Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev
2014-06-04 00:00:14 +00:00
Alan Viverette
3567140b04
Temporary drawable for Quantum progress indicator
...
Also cleans up unused 20dp spinner drawables.
Change-Id: I69aba84eca9f9e8d44a4237d894015caeb3d2308
2014-06-03 16:02:26 -07:00