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

149919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
6304e68160 am 6f31760b: Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev 
* commit '6f31760b25dd216b8bc0e7de170ab31cfda61367':
  Fixed a ltr bug where the buttons disappeared
 2014-08-25 11:56:26 +00:00
Selim Cinek
6e3de6d98f Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev 2014-08-25 11:50:25 +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
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
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
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
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
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
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
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
Matthew Williams
306908f235 Merge "Implement API review feedback for JobScheduler" into lmp-dev 2014-08-23 02:48:19 +00:00
Sandeep Siddhartha
bbea352420 am 4e4a7b3d: Fix an issue with locale for managing intent 
* commit '4e4a7b3d62f0e2cc8ef14e176f3a6a93517e3bc9':
  Fix an issue with locale for managing intent
 2014-08-23 02:04:53 +00:00
Sandeep Siddhartha
efe0f9c7f2 Turn off hotword when in power save mode 
Bug: 15705459
Change-Id: Ifa8b80223affffdc00da467c2066bc6370c85af1
 2014-08-22 18:35:49 -07:00
Sandeep Siddhartha
a54cd53366 Fix an issue with locale for managing intent 
Bug: 17187528
Change-Id: I254d838b6b37934ce81dd1fcd5a047b50d593887
 2014-08-22 18:34:59 -07:00
Sandeep Siddhartha
960c98e2aa am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev 
* commit 'e829259d46d4dc6a5c579c0ddfefbe6d11849c8a':
  Fix the Locale story in the hotword API
 2014-08-23 01:21:31 +00:00
Jeff Davidson
445c45ecf2 am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '785957866a3a2978929ad2c79865575204c7216a':
  Restore legacy VPN stats dialog.
 2014-08-23 01:12:43 +00:00
Sandeep Siddhartha
a434963fad Merge "Fix the Locale story in the hotword API" into lmp-dev 2014-08-23 01:08:18 +00:00
Jeff Davidson
79dbce8661 Merge "Restore legacy VPN stats dialog." into lmp-dev 2014-08-23 00:55:11 +00:00
Yigit Boyar
2d45c00458 am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev 
* commit 'aca6557c9d649778832284e3e158b4d900a52742':
  Clear TextView error when text changes
 2014-08-23 00:42:03 +00:00
Jeff Brown
46a8750aee am 4056d9cb: Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev 
* commit '4056d9cb2bd2e2de21b75950a21b5b7cb45df26d':
  Fix matrix multiply in accessiblity display adjustments.
 2014-08-23 00:34:23 +00:00
Jeff Brown
a136c7e068 am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* commit 'd8b20d399e1834910fcc3fb502ecbe0d15412510':
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:34:18 +00:00
Jeff Brown
92b506fa17 am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit '6a276cec09dd175d175dfc96f7a703b05300f8c9':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-23 00:34:13 +00:00
Jeff Brown
8f7d0e28d5 am 48b8c455: Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 
* commit '48b8c45588fa55e4f92b5db0576a4707124202da':
  Require DEVICE_POWER permission for DOZE_WAKE_LOCK.
 2014-08-23 00:34:08 +00:00
Jeff Brown
7be29436ca am 84ec443d: Merge "Unhide the proximity sensor wakelock." into lmp-dev 
* commit '84ec443d1ab0372f12a56ac5d85ae7cdcae4a943':
  Unhide the proximity sensor wakelock.
 2014-08-23 00:34:03 +00:00
Yigit Boyar
3edb23bc8e Merge "Clear TextView error when text changes" into lmp-dev 2014-08-23 00:31:00 +00:00
Jeff Brown
d4c3a1f77a Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev 2014-08-23 00:24:01 +00:00
Jeff Brown
a96a3c1b65 Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* changes:
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:23:45 +00:00
Jeff Brown
d7761be23d Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 2014-08-23 00:23:41 +00:00
Jeff Brown
de25dc0708 Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 2014-08-23 00:23:26 +00:00
Sandeep Siddhartha
dcf3068fcb Fix the Locale story in the hotword API 
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray

Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.

Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
 2014-08-22 17:23:13 -07:00
Jeff Brown
2835bb7867 Merge "Unhide the proximity sensor wakelock." into lmp-dev 2014-08-23 00:23:00 +00:00
Jeff Davidson
577bf51765 am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'daf5448383a02017bb761841d675c3630ec94cac':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:12:49 +00:00
George Mount
448bace861 API Review: change fragment transition methods. 
Bug 16959326

Change-Id: I7460ac077e81c37bbec3ed6350b6e34f7c7b6e33
 2014-08-22 17:09:05 -07:00
Jeff Davidson
90b1b9f985 Restore legacy VPN stats dialog. 
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
 2014-08-22 17:06:37 -07:00
Jeff Davidson
8288c5b821 Merge "Restore legacy VPN stats dialog strings." into lmp-dev 2014-08-23 00:03:28 +00:00
Tim Kilbourn
4af6348435 am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit '442bb8f66804cfb9894176e6d4ac5b6c455a4caf':
  Update shadow parameters for television.
 2014-08-22 23:55:47 +00:00
Jeff Davidson
8a5a9d32c2 Restore legacy VPN stats dialog strings. 
Bug: 17164793
Change-Id: I5927cdc4f1ceef4cd1cc1b5d17ae97d285bd9a39
 2014-08-22 16:55:32 -07:00
Guang Zhu
17534d9cd5 am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit 'ed43020e15ac965bb2cc7c53b34848e2b953f2a2':
  add some missing assert messages for wifi test
 2014-08-22 23:51:06 +00:00
Tim Kilbourn
aa6215a0d2 Merge "Update shadow parameters for television." into lmp-dev 2014-08-22 23:45:40 +00:00
Tim Kilbourn
fbc1931d6a Update shadow parameters for television. 
Bug: 15859361
Change-Id: If22767a6aa81f897c0705fa0618c314df27b7dcd
 2014-08-22 16:44:53 -07:00
Adam Lesinski
0ad152edaf am 8ff6f579: Merge "AAPT: Filtering resource fix" into lmp-dev 
* commit '8ff6f57929dfda602030bfba662169cf018f0c7f':
  AAPT: Filtering resource fix
 2014-08-22 23:36:31 +00:00
Guang Zhu
1109c7d4fe Merge "add some missing assert messages for wifi test" into lmp-dev 2014-08-22 23:36:01 +00:00