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

211044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Armstrong-Crews
d70377b537 am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 
* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
 2015-09-08 04:43:38 +00:00
Nick Armstrong-Crews
36afc2b767 am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 
* commit '9b8f82a3a073891965a962251f9e613ba8cc90bb':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
 2015-09-08 04:35:36 +00:00
Nick Armstrong-Crews
9b8f82a3a0 Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 2015-09-08 04:28:07 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze." 
This reverts commit 677adf1e66ba83b8fb2c849c181303b35bd489bc.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
 2015-09-08 04:25:01 +00:00
Geoff Mendal
a5b6e120e4 am 953c6a4a: (-s ours) am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE 
* commit '953c6a4a53715bd7e88dad78814110709bf7bf7f':
  Import translations. DO NOT MERGE
 2015-09-07 15:51:05 +00:00
Geoff Mendal
953c6a4a53 am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE 
* commit '024fb4d4b803c35b3aad784f6a2d877a7118c3b2':
  Import translations. DO NOT MERGE
 2015-09-07 15:42:40 +00:00
Geoff Mendal
024fb4d4b8 am 9f3e169c: (-s ours) Import translations. DO NOT MERGE 
* commit '9f3e169c3a6277187fe00abc2eaa08d5872160ef':
  Import translations. DO NOT MERGE
 2015-09-07 15:38:18 +00:00
Geoff Mendal
9f3e169c3a Import translations. DO NOT MERGE 
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
 2015-09-07 08:31:05 -07:00
Lorenzo Colitti
83fa2588f6 Make ConnectivityServiceTest a bit more readable. 
1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1
 2015-09-07 20:41:51 +09:00
Cheryl Potter
4068648139 am 179594bb: am dd9c75f3: am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '179594bb471d401fca5fdf372617ca9bbcf97252':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 23:08:53 +00:00
Renato Mangini
18bdaf44b7 am d9c1c83f: am 18b68b26: am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit 'd9c1c83f45eb1718a6e7ba3fb26790c256c7f344':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 23:08:47 +00:00
Cheryl Potter
179594bb47 am dd9c75f3: am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit 'dd9c75f33181664f7dac7c3d5eb0cc6eae0d6f7b':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 23:00:43 +00:00
Renato Mangini
d9c1c83f45 am 18b68b26: am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '18b68b2650422dd926c11618d5cf1bec1756d9c2':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 23:00:35 +00:00
Cheryl Potter
dd9c75f331 am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '24a6be463e5628416ad234a3e2e33f1f4cc5b287':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:50:51 +00:00
Renato Mangini
18b68b2650 am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '8f2a5b257603971405ce94a57d26dc26233b20db':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:50:47 +00:00
Cheryl Potter
24a6be463e am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '36866dc7347ba37ced74af6f8a6298c62282dacb':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:45:57 +00:00
Renato Mangini
8f2a5b2576 am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '1edd4ebce50a653f3d1454114f5cd73edcace903':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:45:53 +00:00
Cheryl Potter
36866dc734 am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:35:43 +00:00
Renato Mangini
1edd4ebce5 am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:35:36 +00:00
Robert Greenwalt
a59ee3ac09 am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev 
* commit '597c55b5790f2bbc86cd2333a71a934bf351fa3c':
  Cut down some logs.
 2015-09-04 22:27:45 +00:00
Cheryl Potter
4afcda743d am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:24:55 +00:00
Renato Mangini
a8b9a2b7ae am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:24:48 +00:00
Robert Greenwalt
597c55b579 am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev 
* commit 'e686d9b3aa547b89b85b3330d452d06b52196f8c':
  Cut down some logs.
 2015-09-04 22:17:35 +00:00
Cheryl Potter
79ad6310ea Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 2015-09-04 22:14:25 +00:00
Vinit Deshpande
6247701895 Introduce config_wifi_revert_country_code_on_cellular_loss 
This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC

bug: 21795172

Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
 2015-09-04 15:10:47 -07:00
Robert Greenwalt
e686d9b3aa am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev 
* commit '8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
  Cut down some logs.
 2015-09-04 22:06:00 +00:00
Dan Willemsen
a0c61efab9 am 03c26b27: am 596fd38a: Merge "Whitelist windows module" 
* commit '03c26b274aed35c0a580b309567264d00cb643f2':
  Whitelist windows module
 2015-09-04 22:00:26 +00:00
Robert Greenwalt
8e285f2f74 Merge "Cut down some logs." into mnc-dr-dev 2015-09-04 21:51:50 +00:00
Dan Willemsen
03c26b274a am 596fd38a: Merge "Whitelist windows module" 
* commit '596fd38af207727d508a63fca39506c90ba29c44':
  Whitelist windows module
 2015-09-04 21:48:35 +00:00
Dan Willemsen
596fd38af2 Merge "Whitelist windows module" 2015-09-04 21:36:50 +00:00
Joe LaPenna
97eaa6e697 am 551de25f: am ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev 
* commit '551de25fd289c69f2c1ac9f486c88cb9b93861ef':
  Do not wtf when the systemui is not present.
 2015-09-04 21:31:44 +00:00
Dan Willemsen
8d6f9bf3c8 Whitelist windows module 
Bug: 23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c
 2015-09-04 14:22:17 -07:00
Joe LaPenna
551de25fd2 am ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev 
* commit 'ebff4c1d90d8f1465a3376130fe65a9c045b683d':
  Do not wtf when the systemui is not present.
 2015-09-04 21:11:37 +00:00
Joe LaPenna
ebff4c1d90 Merge "Do not wtf when the systemui is not present." into cw-e-dev 2015-09-04 21:01:12 +00:00
Joe LaPenna
acddf2b349 Do not wtf when the systemui is not present. 
Not all devices, like wearables actually have a system ui.

BUG: 23822226

Change-Id: Ibc2d6c3b8db1de668b9cbced3efcec5a7a39f20b
 2015-09-04 12:53:51 -07:00
Nick Armstrong-Crews
7f37402d8c am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 
* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-04 18:22:54 +00:00
Nick Armstrong-Crews
43c4459d99 am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 
* commit '6f0ba402242cb8fd374f5b188e53669ec0cf34c7':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-04 18:11:44 +00:00
Nick Armstrong-Crews
6f0ba40224 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 2015-09-04 18:04:12 +00:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
 2015-09-04 10:20:22 -07:00
Pavel Zhamaitsiak
a80d36218a am 578151c6: am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 
* commit '578151c673bf59e4bccd2237032f720705b4dff2':
  IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
 2015-09-04 16:41:22 +00:00
Sungmin Choi
c28c500501 am 1dcccdf6: am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile 
* commit '1dcccdf615dea92609891c8de42e08b8fa927617':
  Do not show roaming icon for some operators of Chile
 2015-09-04 16:30:25 +00:00
Pavel Zhamaitsiak
578151c673 am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 
* commit 'fb611846f6ca62ea248eac0b35a8d6d1fe5f5116':
  IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
 2015-09-04 16:28:17 +00:00
Sungmin Choi
1dcccdf615 am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile 
* commit '46b7e9e95dc1510e3720361b396de4be50ad59a5':
  Do not show roaming icon for some operators of Chile
 2015-09-04 16:22:00 +00:00
Pavel Zhamaitsiak
fb611846f6 am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 
* commit '566886f7973b86196174e925f16d26975c16a09b':
  IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
 2015-09-04 16:20:11 +00:00
Pavel Zhamaitsiak
566886f797 Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 2015-09-04 16:09:02 +00:00
Sungmin Choi
46b7e9e95d am 4c97f3a4: Do not show roaming icon for some operators of Chile 
* commit '4c97f3a45a3ba345d630e282c07c5126128514eb':
  Do not show roaming icon for some operators of Chile
 2015-09-04 16:08:04 +00:00
Alan Viverette
c0b0da36ea am bc635a25: am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation" 
* commit 'bc635a2574430f345aaa042e003935f315788304':
  Update mFillPaint color on GradientDrawable inflation
 2015-09-04 12:40:02 +00:00
Alan Viverette
bc635a2574 am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation" 
* commit '3d6325460ec19c89c40d2083e8ca89fe53d5575b':
  Update mFillPaint color on GradientDrawable inflation
 2015-09-04 12:31:46 +00:00
Alan Viverette
3d6325460e Merge "Update mFillPaint color on GradientDrawable inflation" 2015-09-04 11:51:02 +00:00
Snild Dolkow
a72f59a858 Update mFillPaint color on GradientDrawable inflation 
When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.

In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.

This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.

Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79
 2015-09-04 10:08:46 +02:00