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

217180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Liu
3991985e12 Merge "A new test for AnimatorSet's clone" 2015-09-04 22:20:22 +00:00
Ben Kwa
545407f6c0 Merge "Factor and consolidate style and color names." 2015-09-04 22:01:45 +00:00
Alan Viverette
9ed62e47c9 Merge "Deprecate FEATURE_PROGRESS and related methods" 2015-09-04 19:16:33 +00:00
Steve McKay
49f34019b6 Merge "Fix erroneous band selection start." 2015-09-04 19:05:16 +00:00
Steve McKay
635b094997 Fix erroneous band selection start. 
Fix band selection to not start when crossing off of a grid item into empty space.
This CL also introduces a MotionEvent wrapper class, since MotionEvent
can't be used in tests.
Note that this CL works around several issues with b/23793622.

Bug: 23727363
Change-Id: I010a82db3363d99f2d804db2653a3a25d8cac940
 2015-09-04 12:03:37 -07:00
Vadim Tryshev
131e8faa97 Merge "Implementing app-centric Shelf." 2015-09-04 18:48:55 +00:00
Nick Armstrong-Crews
e097d341a4 am 7f37402d: am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 
* commit '7f37402d8c5667f72c1ef02a20112d49d7a149b8':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-04 18:35:23 +00: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
Vladislav Kaznacheev
87fc05b85d Merge "Fix drag and drop in Files app." 2015-09-04 18:20:44 +00:00
Alan Viverette
4aef7c8594 Deprecate FEATURE_PROGRESS and related methods 
Bug: 23763003
Change-Id: I4ef97e089db592e438a27657faffa1c8290f2b0e
 2015-09-04 14:14:50 -04:00
Filip Gruszczynski
cf4d2699d2 Merge "Fix NPE in ActivityStack." 2015-09-04 18:13:39 +00:00
Filip Gruszczynski
9ac01a74c2 Fix NPE in ActivityStack. 
Change-Id: Ib2cce4e9e0ce16d28d2aec73585a461405ad90d8
 2015-09-04 11:12:17 -07: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
Ben Kwa
92b547b813 Factor and consolidate style and color names. 
Change-Id: I02d344a4e5528d58e57255a31fbf127402e8ea31
 2015-09-04 11:06:49 -07:00
Nick Armstrong-Crews
6f0ba40224 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 2015-09-04 18:04:12 +00:00
Vadim Tryshev
3560575009 Implementing app-centric Shelf. 
We finally get a UX decision for the Shelf.
Shelf won't have 2 parts - pinned and recents; it will have only 1 list where
all pinned and recent activities of the same kind are grouped under a single icon.
Clicking at that icon activates the latest running activity if it's present, or
starts a new one otherwise.

The above part is implemented in this CL. I removed stuff related to the separate
Recents pane, and moved surviving code to NavigationBarApps.

Later, we'll have menus popping up from the icon, which will allow pinning and unpinning,
and choosing a concrete activity to activate.

Bug: 20024603
Change-Id: Ia08fe62939f92c7ee4f102c07a31e7168a11f010
 2015-09-04 11:02:35 -07:00
Xiaohui Chen
f06607882f Cleanup USER_OWNER in PDB Service 
This assumes that the calling uid is always from user 0, even in split
system user mode.

Bug: 19913735
Change-Id: I99b6a0ca534ac1627c1abb8609c92ff74a5aeabf
 2015-09-04 17:48:26 +00:00
Makoto Onuki
3403b74429 Merge "Replace all occurrences of HashMap/HashSet with ArrayMap/ArraySet." 2015-09-04 17:48:09 +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
77d1b6f2fa am a80d3621: am 578151c6: am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 
* commit 'a80d36218a5cb3ef876d73a2e5294a1279e456e4':
  IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
 2015-09-04 16:51:47 +00: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
88b06ddbce am c28c5005: am 1dcccdf6: am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile 
* commit 'c28c500501bd2fe2416a736423231c8c85545e0a':
  Do not show roaming icon for some operators of Chile
 2015-09-04 16:41:18 +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
Filip Gruszczynski
bba5a1514e Merge "Defer removal of relaunching activity window due to config change." 2015-09-04 16:18:42 +00:00
Vladislav Kaznacheev
b5999ef48a Fix drag and drop in Files app. 
It got broken after the migration to Recycler view.
This patch might be not the perfect fix, but it returns
drag and drop into a working condition.

Testing requires recompile with DEBUG_ENABLE_DND=true

Bug: 22725110
Change-Id: I82cf01af68c6284878af8e46e290d117a0e505c1
 2015-09-04 09:17:37 -07: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
Filip Gruszczynski
76cc44f31c Defer removal of relaunching activity window due to config change. 
This is the first step towards having a better maximization experience.
When the window gets replaced during relaunch of maximized activity we
keep the old window around until the new one is added.

Change-Id: Ia8ce26aee6577740cd38096ed2633216a07ceb60
 2015-09-04 08:43:19 -07:00
Filip Gruszczynski
7431dddbae Merge "Remove unused WMS.mBatteryStats." 2015-09-04 14:50:00 +00:00
Alan Viverette
0ac567bf7b Remove flaky ListManagedCursorTest tests, clean up lint warnings 
Also removes trailing ws.

Bug: 23811652
Change-Id: I2ae5c954606e95bcb4cfe52297717d4caf444cd0
 2015-09-04 10:39:40 -04:00
Abodunrinwa Toki
cbfbf0f2bf Merge "Suppress tests in ListManagedCursorTest." 2015-09-04 14:37:09 +00:00
Abodunrinwa Toki
43d5ccca03 Suppress tests in ListManagedCursorTest. 
These tests are flaky.

Bug: 23811652
Change-Id: Ic2aac3e852fbdaf3cfae54997212b976e830d121
 2015-09-04 15:33:57 +01:00
Alan Viverette
60cb4af5bb am c0b0da36: am bc635a25: am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation" 
* commit 'c0b0da36ea6870601fc1be8d14f8f52ec56095cb':
  Update mFillPaint color on GradientDrawable inflation
 2015-09-04 14:29:45 +00:00
Yasuhiro Matsuda
f9fba98025 am e651ee9b: am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing." 
* commit 'e651ee9bef73c00c3ca1f1ed57485a6c06b802fd':
  Remove unnecessary finally blocks for tracing.
 2015-09-04 14:28:49 +00:00
Andre Eisenbach
fef961ccbb am b013468b: am f1ed1fdb: am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 
* commit 'b013468beca1ec7397c22111b187ffecb20f070a':
  Bluetooth: Fix profile auto-connect logic
 2015-09-04 14:28:39 +00:00
Dan Stoza
4b4d29a6fa am 8dcd14cd: am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit '8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-04 14:28:31 +00:00
Amit Mahajan
da03796dbb am 453ed7dd: am ff751bed: am 2f142ab0: am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev 
* commit '453ed7ddae6fda8ebb5931011f821ce1982a6a4b':
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-04 14:28:24 +00:00
Sharvil Nanavati
9867b2f67e am db8a6ee5: (-s ours) am 80770c09: am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev 
* commit 'db8a6ee56b8e40d0a743e929739fb19a8b3ec456':
  DO NOT MERGE Add 'bluetooth' user to the 'system' group.
 2015-09-04 14:28:12 +00:00
Alan Viverette
660383cfa7 Merge "Use floating-point value for Drawable level" 2015-09-04 14:21:26 +00:00
Abodunrinwa Toki
396d3ca719 Merge "Suppress tests in ListManagedCursorTest." 2015-09-04 13:31:51 +00:00
Abodunrinwa Toki
191f2114ff Suppress tests in ListManagedCursorTest. 
These tests are flaky.

Bug: 23811652
Change-Id: I6b61cebab9517393b6dc0a315e1589739ea50fb8
 2015-09-04 14:16:40 +01: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
Abodunrinwa Toki
6ef116b168 Merge "Suppress AutoCancelTest." 2015-09-04 10:52:13 +00:00
Abodunrinwa Toki
1ef080116e Suppress AutoCancelTest. 
These tests are failing consistently.

Bug: 23807249
Change-Id: I1275747462b20e37ff0f631dbd9e7acfadece5a2
 2015-09-04 11:42:16 +01: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