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

194377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
62043203df Merge "Delete unused" into mnc-dev 2015-06-08 22:51:43 +00:00
John Reck
4538ef2abc Delete unused 
Change-Id: If27e1eb8e42313eae14df58a24ca54fafb2992fa
 2015-06-08 15:45:58 -07:00
Jonathan Basseri
623bf636de Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 2015-06-08 22:27:34 +00:00
Filip Gruszczynski
5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev 
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
 2015-06-08 15:00:25 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
John Spurlock
e37cf3b8d6 Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 2015-06-08 21:03:57 +00:00
Joseph Wen
d8ffe624b2 Merge "Update Statement Service." into mnc-dev 2015-06-08 20:56:25 +00:00
Geoff Mendal
59b28c0c9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 20:53:03 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
John Spurlock
d896323eab QS: Handle font-size changes immediately in ZenModePanel. 
And make sure the condition row is tall enough to accomodate
huge text.

Bug: 20346315
Change-Id: I9346f80edd7f0069d6363fe5377b36b0bf5aca62
 2015-06-08 16:26:12 -04:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Geoff Mendal
4ad2b0c829 Import translations. DO NOT MERGE 
Change-Id: I45739d8c8ae447a724264c4946aedd273a308d91
Auto-generated-cl: translation import
 2015-06-08 13:15:33 -07:00
John Spurlock
c0f7aff3df Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev 2015-06-08 20:13:09 +00:00
keunyoung
7da9d7aa52 Merge "apply force hiding of window only when it is main display" into mnc-dev 2015-06-08 20:08:49 +00:00
Nathan Harold
71feb72b76 Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 2015-06-08 20:05:07 +00:00
James Cook
5ac36cea86 Merge "Use VoiceInteractor.Prompt in VoiceInteraction test app" into mnc-dev 2015-06-08 20:03:39 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks. 
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
 2015-06-08 13:02:44 -07:00
Chris Craik
37cf077171 Merge "Add projection info to RenderNode dumps" into mnc-dev 2015-06-08 20:00:37 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
keunyoung
7a542b66e0 apply force hiding of window only when it is main display 
- force hiding window for non-main display leads into stopping
  rendering of windows in non-main display.
- change the logic to skip force hiding if it is not main display.

bug: 21665476

Change-Id: I2e23f3a2d6e3cbf6819ade1798360efe2986e80e
 2015-06-08 12:55:51 -07:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Nathan Harold
fde06fd323 Fix a typo in the docstring of getAllCellInfo() 
Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
 2015-06-08 12:38:40 -07:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
John Spurlock
a1c7ffe755 Zen QS: Use explicit content descriptions for zen buttons. 
Bug: 21661136
Change-Id: I3a6f7d6deb29584e707c1deb771e3db660007529
 2015-06-08 15:34:05 -04:00
Makoto Onuki
e4bd7c9832 Improve string comment. 
Bug 21685729

Change-Id: If6c79730778f399ed0dbf500ef62df3150fbaea6
 2015-06-08 12:11:01 -07:00
Jorim Jaggi
0e0942d55d Hide top and bottom bar while dozing 
Bug: 18903923
Change-Id: I7b222f9dd168101084f3ee4cbbe6f9495818eab4
 2015-06-08 18:43:26 +00:00
Chris Craik
bf72eb80d9 Add projection info to RenderNode dumps 
bug:21502154

Also fixes several issues around DISPLAY_LIST_DEBUG

Change-Id: I726f5bc071f8c037ffe1b224175fe5c1e2b1c5bd
 2015-06-08 11:39:02 -07:00
dcashman
b576646853 Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 2015-06-08 18:20:47 +00:00
Alex Klyubin
266894644a Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev 2015-06-08 18:11:21 +00:00
Alex Klyubin
2c500236f4 Merge "RSA encrypt with private key in Android Keystore." into mnc-dev 2015-06-08 18:10:09 +00:00
John Reck
5b688e848c Merge "Disable -Werror on Clang" into mnc-dev 2015-06-08 18:08:33 +00:00
John Reck
3bd053f978 Merge "Fix clang warnings" into mnc-dev 2015-06-08 18:08:19 +00:00
John Reck
0f43c3998c Fix clang warnings 
Bug: 21695880
Change-Id: I2985a42a52ab27c546b4317ea70f94d1506c5347
 2015-06-08 11:06:18 -07:00
John Reck
e6178208c2 Disable -Werror on Clang 
Bug: 21698669
Change-Id: I90549599ed52cff028a29f56d3d8ffe80c9afab4
 2015-06-08 11:01:24 -07:00
dcashman
f61ae2de25 Add SYSTEM_DIR check to upgrade-key-set verification. 
Bug: 21697139
Change-Id: I7e6ce3d7f231e0ca5da1f501c80342a04f6c2a1e
 2015-06-08 10:53:20 -07:00
Wale Ogunwale
281dffb76f Merge "Include launched packageName in systrace." into mnc-dev 2015-06-08 17:45:04 +00:00
Adam Lesinski
ce1590dac9 Merge "Wait for wakeup_reasons on first init" into mnc-dev 2015-06-08 17:42:20 +00:00
Dimitry Ivanov
25bb4553f3 Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-dev 2015-06-08 17:28:25 +00:00
Amit Mahajan
829c097761 Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 2015-06-08 17:27:29 +00:00
Amit Mahajan
9b5e2124d0 Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 2015-06-08 17:26:03 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Alex Klyubin
4350babc02 Remove deprecated android.security.KeyStore methods. 
* delKey -> delete
* getPubkey -> exportKey
* saw -> list.

Bug: 18088752
Change-Id: Ifb794f91a42646d67da1340ee16765cbaf255a49
 2015-06-08 10:14:58 -07:00
Dimitry Ivanov
47fc7fe7f6 Revert "Print exception stacktrace on failed scanPackageLI" 
This reverts commit 95b7d50ce1a1ae879bbb1b8b8262172744c28d0e.

Bug: 8076853
Change-Id: Ia19e6638a97b7b49561932752a204990e3a486d4
 2015-06-08 17:12:55 +00:00
Wale Ogunwale
7fa228f4ea Merge "Release voice wake lock at end of voice interaction session" into mnc-dev 2015-06-08 17:05:09 +00:00
James Cook
dd231d466f Use VoiceInteractor.Prompt in VoiceInteraction test app 
The framework API that takes a CharSequence as a prompt is now
deprecated, so update the test code to use the new API.

Bug: 21695917
Change-Id: Ic4b7afa6c547a9885a900ed092910f3c6bdd1dd4
 2015-06-08 10:03:35 -07:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id. 
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
 2015-06-08 17:01:23 +00:00
Wale Ogunwale
4a922d4700 Release voice wake lock at end of voice interaction session 
Bug: 21615776
Bug: 21615761
Change-Id: I75d568474d4df5f21ea5b616887c6187e54f69e7
 2015-06-08 09:59:54 -07:00
Tim Kilbourn
72285e5600 API review: Update hasMic to hasMicrophone. 
Also make the SearchEvent constructor available for testing.

Bug: 21572283
Bug: 21572676
Change-Id: I35cfd88b45aeb97b6ccf83aeb46b0ecc4bbc0947
 2015-06-08 16:52:36 +00:00
Clara Bayarri
2ea838d539 Merge "Remove insertion action mode runnable on selection start" into mnc-dev 2015-06-08 16:51:00 +00:00