drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,502 Commits 1 Branch 0 Tags
Commit Graph

144502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Lee
10540cdbe4 am f0e8e160: am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 
* commit 'f0e8e160a774f9e3cb8c2bf6dccdb1e98501b517':
  Don't throw RemoteException in public RemoteCallVideoClient APIs.
 2014-07-22 22:15:26 +00:00
Jason Long
98236b3867 am 91c5480e: am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev 
* commit '91c5480ee6de8f3f740708e71d5be355e2c04266':
  Switched Holo to Material for account chooser activities.
 2014-07-22 22:15:21 +00:00
Adrian Roos
18b6790bdc am 70917abe: am ff3666ad: Kill flashlight when launching the camera from lockscreen 
* commit '70917abeddb096dca993636020c80a1b2085dcc6':
  Kill flashlight when launching the camera from lockscreen
 2014-07-22 22:15:17 +00:00
Andrew Lee
abafc1b9ca am 9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 
* commit '9d8c0b5cd7ea662f14aeaf4b54138e840bac7adc':
  Don't throw RemoteException in public RemoteCallVideoClient APIs.
 2014-07-22 22:08:28 +00:00
Jason Long
d7aa76ae79 am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev 
* commit 'e3d7fc4b6c485545851b3851e8e6b2abf8b180b3':
  Switched Holo to Material for account chooser activities.
 2014-07-22 22:08:25 +00:00
Adrian Roos
40e917a5aa am ff3666ad: Kill flashlight when launching the camera from lockscreen 
* commit 'ff3666adc57d9faad2636a26ed87bbeef7001131':
  Kill flashlight when launching the camera from lockscreen
 2014-07-22 22:08:21 +00:00
Adrian Roos
0383c80247 am ff704ec8: am ed9a0c81: QS: Hide flashlight tile if camera is busy 
* commit 'ff704ec8a4130e0fba4e9b8e980f34c64486ec54':
  QS: Hide flashlight tile if camera is busy
 2014-07-22 22:07:20 +00:00
Adrian Roos
a04431e840 am ed9a0c81: QS: Hide flashlight tile if camera is busy 
* commit 'ed9a0c819452d4b22d966623fa217e28de815fd6':
  QS: Hide flashlight tile if camera is busy
 2014-07-22 22:03:16 +00:00
Santos Cordon
541a06e777 Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 2014-07-22 22:02:55 +00:00
Chris Craik
c403a39089 Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 2014-07-22 22:02:55 +00:00
Chris Craik
0645128b80 Make setter methods on Outline call setEmpty() based on params 
bug:16142564

Additionally, better define behavior around null outline providers:

A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.

Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
 2014-07-22 15:15:11 -07:00
John Spurlock
0323bf7553 Merge "BatterySaver: Make the bars orange." into lmp-dev 2014-07-22 22:02:55 +00:00
John Spurlock
0ff62e0911 BatterySaver: Make the bars orange. 
Bug:16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
 2014-07-22 18:53:08 -04:00
John Spurlock
79cac9d0f0 Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev 2014-07-22 22:02:49 +00:00
John Spurlock
333f8dd78f Wire up CATEGORY_ALARM and CATEGORY_EVENT. 
And remove the alarm package whitelist now that deskclock
uses a category.

Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
 2014-07-22 21:06:34 -04:00
Adrian Roos
1e1d6ac541 Kill flashlight when launching the camera from lockscreen 
Bug: 16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
 2014-07-22 22:01:29 +00:00
Adrian Roos
930aaa717e QS: Hide flashlight tile if camera is busy 
Currently behind a flag because the camera API for this not working
correctly yet.

Bug: 16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
 2014-07-22 22:00:14 +00:00
Robin Lee
ea697d7269 am 51533e26: am 96251e35: Stop double-loading device admins 
* commit '51533e265dc5081d70c010d6f17e36f6b72dc8e5':
  Stop double-loading device admins
 2014-07-22 21:53:45 +00:00
Alan Viverette
52ff21d841 Merge "Remove dialog icons" into lmp-dev 2014-07-22 21:50:21 +00:00
Alan Viverette
ed8e09b664 Remove dialog icons 
BUG: 16493564
Change-Id: Ica59abb70a924cccd705172d323a535ef9b75cf1
 2014-07-22 18:41:37 -07:00
Paul Soulos
bc642e88ae am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework 
* commit '642251ef91bf4d593d7ab657df03b00afb2973ac':
  Adds ScrollBounds to the Transition framework
 2014-07-22 21:47:25 +00:00
Alan Viverette
1504123949 am 62e45ecb: am d6f1350f: Make toolbarStyle public 
* commit '62e45ecbd12fa6221d8f0dfeb53df1af22409c6f':
  Make toolbarStyle public
 2014-07-22 21:47:21 +00:00
Robert Ly
bf56efcabf am b5bf50b8: am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'b5bf50b8995415ce1f205d76dc87aae05b65ba5a':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 21:47:17 +00:00
David Friedman
3a95c5904c am 83fc010d: am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '83fc010d0ab693fb1d06f89980ae629894a44ade':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 21:47:13 +00:00
Chris Craik
8ef999a3e8 am c9d4ee79: am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev 
* commit 'c9d4ee79e73f000987a05d9d27d5eb024e5ba525':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
 2014-07-22 21:47:09 +00:00
Alexandra Gherghina
a461c35ef5 am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync 
* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
  Do Not Merge Per-user API for master sync
 2014-07-22 21:47:05 +00:00
Scott Rowe
30c5f1a3f0 am 487dd79a: am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '487dd79ab28525a3a3c685dd39f09ab0539757a1':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 21:47:01 +00:00
Igor Murashkin
6f978b3e73 am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 
* commit 'f555fe554c28bc8f4e094dce502f343d70be4f3e':
  camera2: Add legacy available Request/Result/Characteristics keys
 2014-07-22 21:46:55 +00:00
Alan Viverette
7b689aa6cf am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '11dbd68d68aba1c7f42304544f88fbffe496bb02':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:46:49 +00:00
Alex Klyubin
7b969f3eea am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style. 
* commit '0caaa29e5bf388c929e81ed417637f4fe4df52f8':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:46:43 +00:00
Robin Lee
e5cde201b7 am 96251e35: Stop double-loading device admins 
* commit '96251e350b75e6ddbe061e891cfb15f54c936b4b':
  Stop double-loading device admins
 2014-07-22 21:45:56 +00:00
Paul Soulos
ea55f7820a am 9d129942: Adds ScrollBounds to the Transition framework 
* commit '9d129942f470ccb10096ebd1afe61a4be36419d0':
  Adds ScrollBounds to the Transition framework
 2014-07-22 21:39:52 +00:00
Alan Viverette
c41dd1039c am d6f1350f: Make toolbarStyle public 
* commit 'd6f1350fddb45253820fd8c07497186829788f6f':
  Make toolbarStyle public
 2014-07-22 21:39:42 +00:00
Robert Ly
0d65c8a739 am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit '1c08a2ba917f732c8f4a18862b331f43d64f1505':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 21:39:33 +00:00
David Friedman
cbc3815469 am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '0514aba57216b2388f85822b7a39731cd9a9ee7e':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 21:39:29 +00:00
Chris Craik
cd96a6f0de am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev 
* commit '52b2ae22c6e1ede01027c83cad33507cbfceabd9':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
 2014-07-22 21:39:26 +00:00
Alexandra Gherghina
7f9a433e98 am 5f9a77e5: Do Not Merge Per-user API for master sync 
* commit '5f9a77e5337c16335abaa586beab900c25014668':
  Do Not Merge Per-user API for master sync
 2014-07-22 21:39:14 +00:00
Scott Rowe
8d4f88a60f am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit 'd6900ec2a6603433e50657a7843966c7d10651ea':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 21:39:09 +00:00
Igor Murashkin
a23eebfd83 am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 
* commit '8f9b6d08fe8b8fc7d8ad88bb68989ebb13dd7aae':
  camera2: Add legacy available Request/Result/Characteristics keys
 2014-07-22 21:39:05 +00:00
Alan Viverette
741fd64fdd am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '290f45f5affaedcc1ad07b531f700e9695e48b3f':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:38:58 +00:00
Alex Klyubin
bfa1d1d1e7 am 09a76692: Align PSKKeyManager with framework API style. 
* commit '09a766924c6b1066d63348d2b9dcb3dcdc561a94':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:38:54 +00:00
Robin Lee
9c2be6c7ba Stop double-loading device admins 
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.

Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.

Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.

@bug 16416936

Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
 2014-07-22 21:35:09 +00:00
Paul Soulos
2dcab18c6c Adds ScrollBounds to the Transition framework 
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
 2014-07-22 14:17:48 -07:00
Alan Viverette
b97326f067 Make toolbarStyle public 
BUG: 16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
 2014-07-22 14:05:46 -07:00
Robert Ly
4df9575807 am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 21:00:07 +00:00
David Friedman
2fe7d87074 am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:55:55 +00:00
Robert Ly
c12d7e3a3d am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:53:20 +00:00
David Friedman
42dbe80914 am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +00:00
Robert Ly
ff428e08a5 am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:49:05 +00:00
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00