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

89550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
dffd302f7d am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit 'a58800d153f2a3db963ccbf9347eeccf855ed421':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 17:13:17 -07:00
Jeff Brown
15aa543a58 am 65d8433f: am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '65d8433f7be3310bd7847fc5521cbe8fd27acc0a':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 17:13:12 -07:00
Jeff Brown
44877a16e7 am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '35499475d238b6f4f5a07fd59dcddc4bc391f0d8':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:13:08 -07:00
Craig Mautner
567f47b8aa am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit 'a37994b2b4e2fe02c93c40699442c7a13052c57c':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:13:03 -07:00
Chris Wren
b62302dd2b am 9b339b74: am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev 
* commit '9b339b740efd2e7ae477126187d622efd76319de':
  Copy date format style from keyguard.
 2012-10-11 17:12:56 -07:00
Joe Fernandez
3a3014c152 am 95f9b4b9: am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '95f9b4b9a5299c0c2902d932ee4039c51a109c3c':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 17:12:51 -07:00
Adam Powell
ff99f59f0b am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit '4e5efaef793c58ff014265eab7f11c3ded34b2ed':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 17:12:47 -07:00
Fabrice Di Meglio
4c95bfd5ad am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '39b0c29e4f6582420518f1124af262865797339d':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 17:12:32 -07:00
Winson Chung
ef36a54942 am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'f0a8045e727e9bff08b4890521912afc6564a895':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:12:26 -07:00
Svetoslav Ganov
cf19242d7b am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit '756cf7e88294905f0dfa6a25981e0592e1df1689':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 17:12:22 -07:00
Winson Chung
c68bab01af am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev 
* commit '8e981df711c6991eba437dccde803828df60b24f':
  Ignore dying users when testing for number of users on device. (Bug 7332248)
 2012-10-11 17:12:14 -07:00
Chris Wren
f66bf0e867 am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit 'a35f8ce39ff86e8ad1ce905ba58112d7e2f8684a':
  resolve conflicting assumptions from the merge.
 2012-10-11 17:12:10 -07:00
Dave Burke
d4aa3b6894 am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit '950407d09e02181af7553690418f304da417f372':
  Add new ringtones/notifications for Occam.
 2012-10-11 17:12:03 -07:00
Danielle Millett
855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:11:50 -07:00
Daniel Sandler
bfd9757305 am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit '22cc5c76d08bbd1017d06f0157b6801b7c38870c':
  New icon for quick settings button.
 2012-10-11 17:11:43 -07:00
Svetoslav Ganov
a7f38925f7 am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 
* commit 'd3e5180f7cec9df97e983f228aa753efcd193013':
  Prevent out of range magnification scale to be persisted.
 2012-10-11 17:11:37 -07:00
Jeff Sharkey
e0fec43459 am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit '1cf5bd2aeb983e09e7e4b664b1380c30b94b4d50':
  Database cleanup needs to happen for all users.
 2012-10-11 17:11:19 -07:00
Adam Cohen
6879426372 am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
  Final keyguard tablet layout integration
 2012-10-11 17:11:13 -07:00
Svetoslav Ganov
0294214519 am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit 'a1489d302289e92e7135452db3fee446e2452535':
  Send accessibility event for content change upon setting content description.
 2012-10-11 17:11:09 -07:00
Daniel Sandler
8c17d23e41 am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '09a4a4c29c42ddb7c515a10911db108f77de2e0c':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 17:11:02 -07:00
Dianne Hackborn
fc31380adf am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
  More on issue #7318666: hide developer options from user build
 2012-10-11 17:10:54 -07:00
Satoshi Kataoka
95189b9225 am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
  Don't update the text services locale in the main thread
 2012-10-11 17:10:50 -07:00
Baligh Uddin
31f3d527ba am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bcace62f72efa7dd1722b86837af2399c9507beb':
  Import translations. DO NOT MERGE
 2012-10-11 17:10:38 -07:00
Winson Chung
a58800d153 am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit '4cce397c0dab44cf7b1b657d0e5410b5970eef55':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 14:58:47 -07:00
Jeff Brown
65d8433f7b am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '2e21bdbe303a8abba406bdb5469944419e3a698a':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 14:58:44 -07:00
Jeff Brown
35499475d2 am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '17026864e846630da7b619b55c5a65311484656c':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 14:57:05 -07:00
Winson Chung
4cce397c0d Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 2012-10-11 14:56:56 -07:00
Jeff Brown
2e21bdbe30 Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 2012-10-11 14:56:56 -07:00
Jeff Brown
17026864e8 Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 2012-10-11 14:53:54 -07:00
Craig Mautner
a37994b2b4 am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit '46fb9e9f226c234c2b95428b8827df3cb0333cde':
  Check for apps closing and restore mExiting test.
 2012-10-11 14:52:15 -07:00
Craig Mautner
46fb9e9f22 Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 2012-10-11 14:48:57 -07:00
Chris Wren
9b339b740e am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev 
* commit '853a1ceae056d773a41716a8a586118be1fa9dac':
  Copy date format style from keyguard.
 2012-10-11 14:45:56 -07:00
Joe Fernandez
95f9b4b9a5 am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '8091c8e996fa6a5650319661b3aecb3870651191':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:43:02 -07:00
Chris Wren
853a1ceae0 Merge "Copy date format style from keyguard." into jb-mr1-dev 2012-10-11 14:42:33 -07:00
Joe Fernandez
8091c8e996 am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '07d2ad883b43a80469ec881421d544ff3b75c50a':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:40:44 -07:00
Joe Fernandez
07d2ad883b am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit 'dff6f01f32be0005a3dfb57f54d10859d013c4fb':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:38:09 -07:00
Adam Powell
4e5efaef79 am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit '49dbc1617c5e0ea56d5568fdcbfe9a771671567a':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 14:37:02 -07:00
Joe Fernandez
dff6f01f32 am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '45c56ae70a1989301fa0fac5c72c51b296f5146e':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:35:35 -07:00
Joe Fernandez
45c56ae70a Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 2012-10-11 14:33:37 -07:00
Adam Powell
49dbc1617c Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 2012-10-11 14:32:50 -07:00
Jeff Brown
2444ae7e2b Ensure MediaRouter correctly handles renamed Wifi displays. 
Fix a couple of bugs that cause MediaRouter to disconnect from
the current Wifi display whenever it is renamed.

Added an extra check in WifiDisplayAdapter for identity renames.
The Settings app already handles this case but it's good to have
the service check for it as well so we don't store unnecessary
aliases.

Bug: 7310777
Change-Id: I8fddd32ca59f9b798ee31b467b81457508c345f8
 2012-10-11 14:30:21 -07:00
Winson Chung
6611988429 Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731) 
Change-Id: I4da99c259df51f8f66d3ade1156040bd0360ca5d
 2012-10-11 14:27:03 -07:00
Adam Powell
77ace2ef69 Revert "Fixed group and child view caching in SimpleExpandableListAdapter." 
This reverts commit b49e4d63d1976b673b4763bc012d152833609688.

This produced problems with app compatibility. The boolean array
introduced in this patch is never resized and can cause applications
expecting different behavior to crash with index out of bounds
exceptions.

This looks like a good path but it will need to be revisted later.

Bug 7221618
 2012-10-11 14:26:21 -07:00
Fabrice Di Meglio
39b0c29e4f am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit 'ec139240480702e80cd56c0309394f7549a993f3':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 14:15:00 -07:00
Craig Mautner
a987d43bc9 Check for apps closing and restore mExiting test. 
Removal of the mExiting test in a previous CL was a mistake leading
to z-order errors. In particular the auto complete dialog was on top
of the IME and was being dismissed due to touches on the IME.

Restoring mExiting alone missed cases where apps were exiting which
don't set mExiting. Adding a test for membership in mClosingApps
fixes that.

Bug: 7327220 fixed.
Change-Id: I3965b8a07080d1347bdada51ffeafe6ef2e32c8e
 2012-10-11 14:13:31 -07:00
Fabrice Di Meglio
ec13924048 Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 2012-10-11 14:10:02 -07:00
Winson Chung
f0a8045e72 am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'ee0d8deb5e4bb9e2d9caef2c988f483afe9f24a7':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 13:59:13 -07:00
Svetoslav Ganov
756cf7e882 am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit 'b3c38156fc3f1ff2621c8e0961ebf75a5486d2b4':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 13:59:10 -07:00
Winson Chung
ee0d8deb5e Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 2012-10-11 13:56:24 -07:00
Svetoslav Ganov
b3c38156fc Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 2012-10-11 13:56:24 -07:00