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

152763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
2a54a3adea am a7090255: am 44505361: am 0d86a94f: Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 
* commit 'a70902550ec0b0e3120632087e68189172c385d1':
  TIF: define hidden channels columns as @SystemApi
 2014-08-25 08:25:40 +00:00
Jungshik Jang
cabc039e3b am 916f6460: am f28329a3: am 1b6b1b7b: Merge "Use common language code in hdmi service." into lmp-dev 
* commit '916f6460f34c5308e8d5a6017ff41cde40411020':
  Use common language code in hdmi service.
 2014-08-25 08:25:30 +00:00
Wei Wang
ba48c1d41e am ae31bcd3: am 549f92b1: am 3952e39c: Merge "Fix API council review comments. Also hide certain APIs(1/3)." into lmp-dev 
* commit 'ae31bcd330d731f38e1eb7c4d82a6e6500376123':
  Fix API council review comments. Also hide certain APIs(1/3).
 2014-08-25 08:25:14 +00:00
Jeff Sharkey
eec8bc405f am ce960bf4: am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit 'ce960bf43a17ac79aa9b26b0f80aa90163d18697':
  Installing splits into ASECs!
 2014-08-25 08:25:04 +00:00
George Mount
0e3de61f90 am cef72c8a: am 1bb44645: am 8c789490: Merge "API Review: change fragment transition methods." into lmp-dev 
* commit 'cef72c8a21a9e8d0bd0f3af42114c72935701d29':
  API Review: change fragment transition methods.
 2014-08-25 08:24:58 +00:00
Sandeep Siddhartha
05e9475665 am efed0ad6: am f10201e4: am 2d4e58e7: Merge "Turn off hotword when in power save mode" into lmp-dev 
* commit 'efed0ad67af2ebdc3edfed5b94fee923a35fd8d7':
  Turn off hotword when in power save mode
 2014-08-25 08:24:32 +00:00
Paul Lawrence
5432052f68 am bee67db7: am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev 
* commit 'bee67db720e33f830714f4bada6f712a25dd7fad':
  Fix adb backup for encrypted case
 2014-08-25 08:24:27 +00:00
Matthew Williams
d308790da6 am efd88692: am f56a5290: am fdb7e602: Merge "Implement API review feedback for JobScheduler" into lmp-dev 
* commit 'efd8869219e16506eab663dc228f4a905fa2bcf0':
  Implement API review feedback for JobScheduler
 2014-08-25 08:23:52 +00:00
Sandeep Siddhartha
1e39e61ce9 am b24467bc: am f45cc194: am 4e4a7b3d: Fix an issue with locale for managing intent 
* commit 'b24467bc88b8073262d7edad6acbb1acbc1355dc':
  Fix an issue with locale for managing intent
 2014-08-25 08:23:46 +00:00
Sandeep Siddhartha
539207b991 am 68f133b4: am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev 
* commit '68f133b422733f89c9e226c636ce6153d4e86f1c':
  Fix the Locale story in the hotword API
 2014-08-25 08:23:41 +00:00
Jeff Davidson
5c470843a4 am baf519c9: am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit 'baf519c9599a7ecb06db3281746708e5ccdeb10c':
  Restore legacy VPN stats dialog.
 2014-08-25 08:23:13 +00:00
Yigit Boyar
b3a523249e am 3037469b: am af314829: am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev 
* commit '3037469b782ae76898ec794557b17407d84046e8':
  Clear TextView error when text changes
 2014-08-25 08:23:05 +00:00
Jeff Brown
5d13662bb5 am e8efb182: am 25ea66dd: am 4056d9cb: Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev 
* commit 'e8efb1826b97771dc4c94d0fbe463962b9d9d1a6':
  Fix matrix multiply in accessiblity display adjustments.
 2014-08-25 08:22:57 +00:00
Jeff Brown
da773e1b44 am 049cae6c: am cd4d217a: am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* commit '049cae6c3d612daa481e5683523a678c3a1ebb20':
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-25 08:22:53 +00:00
Jeff Brown
4b40c24877 am d35615ce: am fdfd79f2: am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit 'd35615ce7a0ffd477d0dae8d098813d62e92a7db':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-25 08:22:48 +00:00
Jeff Brown
10264fef54 am 2867b9f1: am f8dcbab4: am 48b8c455: Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 
* commit '2867b9f133a75af922c39d6d58249bd15e637717':
  Require DEVICE_POWER permission for DOZE_WAKE_LOCK.
 2014-08-25 08:22:43 +00:00
Jeff Brown
e80e92e4eb am 7f0182e7: am aa5912c8: am 84ec443d: Merge "Unhide the proximity sensor wakelock." into lmp-dev 
* commit '7f0182e78454a5d72d39b57c1f2369122e850cd9':
  Unhide the proximity sensor wakelock.
 2014-08-25 08:22:38 +00:00
Jeff Davidson
30dd874149 am 531b322e: am e00e0e4e: am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit '531b322ee6e6d1c7d192056a2cdebf2660fd4bbf':
  Restore legacy VPN stats dialog strings.
 2014-08-25 08:22:21 +00:00
Stephen Hines
c8e23f74ed am 6c36b307: am c0d6f025: am 007848ad: Merge "We need to specify a target SDK < 21 to use graphics RS." 
* commit '6c36b30733fd3dea5ba2c341a08b0d80a6d6a194':
  We need to specify a target SDK < 21 to use graphics RS.
 2014-08-25 08:21:54 +00:00
Tim Kilbourn
4ec57e600f am c9b975ce: am 597973c9: am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit 'c9b975ce4583a3be0feae09943b39c6412cc3f2a':
  Update shadow parameters for television.
 2014-08-25 08:21:29 +00:00
Guang Zhu
33188662fe am f3b809df: am 1312c106: am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit 'f3b809dff0a2b541b9c21091ac2ec05f9fd148d5':
  add some missing assert messages for wifi test
 2014-08-25 08:21:22 +00:00
Adam Lesinski
a8dea906a3 am 0e30b140: am fe8c0080: am 8ff6f579: Merge "AAPT: Filtering resource fix" into lmp-dev 
* commit '0e30b14080bcae532aacfac6a6d1e52947e23442':
  AAPT: Filtering resource fix
 2014-08-25 08:21:07 +00:00
Wonsik Kim
35de51001d am 44505361: am 0d86a94f: Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 
* commit '4450536147cc33405f46d379c945c3197a8face4':
  TIF: define hidden channels columns as @SystemApi
 2014-08-25 06:34:48 +00:00
Wonsik Kim
944ee5a2f0 am 0d86a94f: Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 
* commit '0d86a94f2f8c44546ba0d8979473b23d7100ed5b':
  TIF: define hidden channels columns as @SystemApi
 2014-08-25 06:25:03 +00:00
Wonsik Kim
1c50575a38 Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 2014-08-25 06:17:56 +00:00
Wonsik Kim
8d0b268e42 TIF: define hidden channels columns as @SystemApi 
Bug: 17165479
Change-Id: Ic0b0bdbc440eb15e68e4a1a5fa15a4875b17d061
 2014-08-25 14:21:40 +09:00
Jungshik Jang
fef7684c0e am f28329a3: am 1b6b1b7b: Merge "Use common language code in hdmi service." into lmp-dev 
* commit 'f28329a36cdcd061094e711c2e511387d873e018':
  Use common language code in hdmi service.
 2014-08-25 03:21:40 +00:00
Jungshik Jang
81bb44af60 am 1b6b1b7b: Merge "Use common language code in hdmi service." into lmp-dev 
* commit '1b6b1b7bfc7e3199169fcdcbcf721f611386278c':
  Use common language code in hdmi service.
 2014-08-25 03:04:27 +00:00
Jungshik Jang
ac0d62a118 Merge "Use common language code in hdmi service." into lmp-dev 2014-08-25 02:08:52 +00:00
Wei Wang
8159074f3f am 549f92b1: am 3952e39c: Merge "Fix API council review comments. Also hide certain APIs(1/3)." into lmp-dev 
* commit '549f92b1135b5141918c13ddde6ba45db646b0cf':
  Fix API council review comments. Also hide certain APIs(1/3).
 2014-08-24 23:19:05 +00:00
Wei Wang
add47ac2fc am 3952e39c: Merge "Fix API council review comments. Also hide certain APIs(1/3)." into lmp-dev 
* commit '3952e39c05d58045e4c584cd9126d6240599dc2b':
  Fix API council review comments. Also hide certain APIs(1/3).
 2014-08-24 23:06:18 +00:00
Wei Wang
b1e066bc27 Merge "Fix API council review comments. Also hide certain APIs(1/3)." into lmp-dev 2014-08-24 23:00:20 +00:00
Jeff Sharkey
daa88714a1 am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit '9f3ddd551393b4fbc421156b8f700cae7dbd6a3b':
  Installing splits into ASECs!
 2014-08-24 19:04:07 +00:00
Jeff Sharkey
1b54ede9de am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit 'e3218d357101b948641ce361ed0b21ebc97e44be':
  Installing splits into ASECs!
 2014-08-24 18:55:47 +00:00
Jeff Sharkey
37cf9907d2 Merge "Installing splits into ASECs!" into lmp-dev 2014-08-24 18:45:55 +00:00
George Mount
3b51c30088 am 1bb44645: am 8c789490: Merge "API Review: change fragment transition methods." into lmp-dev 
* commit '1bb4464550d66dd67dbdbc3e4e41eb64bdf86903':
  API Review: change fragment transition methods.
 2014-08-24 18:28:14 +00:00
George Mount
85e80400b9 am 8c789490: Merge "API Review: change fragment transition methods." into lmp-dev 
* commit '8c78949019d0e0a35094dbeedd2c786e2e46acd3':
  API Review: change fragment transition methods.
 2014-08-24 18:21:59 +00:00
George Mount
da604cc1ec Merge "API Review: change fragment transition methods." into lmp-dev 2014-08-24 18:11:07 +00:00
Sandeep Siddhartha
6c6b7dfcf9 am f10201e4: am 2d4e58e7: Merge "Turn off hotword when in power save mode" into lmp-dev 
* commit 'f10201e4963e29758615338d8d9007fde4a361fd':
  Turn off hotword when in power save mode
 2014-08-23 23:00:46 +00:00
Sandeep Siddhartha
245af0bd0c am 2d4e58e7: Merge "Turn off hotword when in power save mode" into lmp-dev 
* commit '2d4e58e729800edbee6771b3902f773056dd27b8':
  Turn off hotword when in power save mode
 2014-08-23 22:50:57 +00:00
Sandeep Siddhartha
a2c1449bb7 Merge "Turn off hotword when in power save mode" into lmp-dev 2014-08-23 22:45:51 +00:00
Paul Lawrence
d70c21d616 am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev 
* commit 'f1b2348d6afb43b400b98846fda74ca3520287f4':
  Fix adb backup for encrypted case
 2014-08-23 20:59:22 +00:00
Paul Lawrence
b8f7ecf9e4 am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev 
* commit 'b34de6be2ede2e31a79958d6a2e6c53761c92d04':
  Fix adb backup for encrypted case
 2014-08-23 20:50:23 +00:00
Paul Lawrence
b8e6838583 Merge "Fix adb backup for encrypted case" into lmp-dev 2014-08-23 20:44:30 +00:00
Matthew Williams
1a2e780604 am f56a5290: am fdb7e602: Merge "Implement API review feedback for JobScheduler" into lmp-dev 
* commit 'f56a5290757b3c209d8d5ee3fa0b1224cd57305a':
  Implement API review feedback for JobScheduler
 2014-08-23 06:19:39 +00:00
Sandeep Siddhartha
4c026eb47c am f45cc194: am 4e4a7b3d: Fix an issue with locale for managing intent 
* commit 'f45cc19452c0b8543075de17caa8e119f51525a2':
  Fix an issue with locale for managing intent
 2014-08-23 06:19:33 +00:00
Sandeep Siddhartha
173db08cce am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev 
* commit 'a8d8e4c439da6a3b9292335d631c6ec65ff45b01':
  Fix the Locale story in the hotword API
 2014-08-23 06:19:01 +00:00
Matthew Williams
ddb794775a am fdb7e602: Merge "Implement API review feedback for JobScheduler" into lmp-dev 
* commit 'fdb7e6027c8976c48ad9eb535b7c18d8d5dacf85':
  Implement API review feedback for JobScheduler
 2014-08-23 02:58:52 +00:00
Jeff Davidson
c52b5b1fc1 am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '9f207f97d7b04465f3ed86af1ce855f1a84c40d9':
  Restore legacy VPN stats dialog.
 2014-08-23 02:48:48 +00:00
Matthew Williams
306908f235 Merge "Implement API review feedback for JobScheduler" into lmp-dev 2014-08-23 02:48:19 +00:00