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

171571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
aaf2e190d3 am daec5943: Fix build 
* commit 'daec594370f0e47bf07d0c9c968e3c5dfedf0bb5':
  Fix build
 2014-12-11 00:36:19 +00:00
Alan Viverette
7d0aed2d2c am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 
automerge: c211857

* commit 'c211857af37eabb6073fa2ac402c9f7de9548822':
  Update tint filter after setting gradient drawable state
 2014-12-11 00:32:53 +00:00
Joe Fernandez
c3daed967d Merge "docs: platform updates for api 21" into lmp-docs 2014-12-11 00:31:54 +00:00
Alan Viverette
daec594370 Fix build 
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
 2014-12-10 16:29:59 -08:00
Alan Viverette
c211857af3 am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 
* commit '4e1374378d41f15cefc1f5889fd4d549461485ff':
  Update tint filter after setting gradient drawable state
 2014-12-11 00:29:51 +00:00
Joe Fernandez
378c71a391 am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit '235e4be4c92fbc68544f15bebcc6a92ab5d21183':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 00:29:19 +00:00
Andrew Solovay
f43c057ca6 am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'c7ad6e9175e232416c22386b80f2c5c9b5031d81':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 00:29:14 +00:00
Winson Chung
4e4fd0f721 am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 
automerge: b485445

* commit 'b4854456c0e9092900a6432eb90d7c552c029070':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 00:28:57 +00:00
Joe Fernandez
235e4be4c9 Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 2014-12-11 00:27:02 +00:00
Shishir Agrawal
23172c706b am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 00:24:33 +00:00
Amith Yamasani
2467188e39 am a2530e4a: am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'a2530e4aa4c35787516ffea8368c0ebc35da4df4':
  Stop guest user on exiting, to conserve resources
 2014-12-11 00:24:26 +00:00
Alan Viverette
4e1374378d Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 2014-12-11 00:23:33 +00:00
Dmitriy Ivanov
c4e52d0ed9 resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp. 
Change-Id: I5cbcf74319afc3ae9d0e9280b572a59286565de8
 2014-12-10 16:22:00 -08:00
Andrew Solovay
c7ad6e9175 docs: Added info about managed profiles to "Android 5.0 Changes" 
Also a couple of unrelated changes while the file was open.

See first comment for link to staged doc.

Change-Id: I56dd57104729dec353b0dd630715a43a73d043d3
 2014-12-10 16:08:23 -08:00
Dmitriy Ivanov
c627d61f29 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-12-11 00:07:50 +00:00
Alan Viverette
9e8fbe42e9 am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
  Always call onDateChanged() when the date picker selection changes
 2014-12-11 00:07:32 +00:00
Dianne Hackborn
5e0550f48e am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'dc1e9f4813c61354f7e7459708684e4241b12e90':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-11 00:07:26 +00:00
Alan Viverette
1259ab3a88 am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '3d517a701cb583f59ed8deefd21ab854c3890065':
  Avoid creating futures for drawables with no constant state
 2014-12-11 00:07:20 +00:00
Adam Lesinski
347040cf84 am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '740acf213c56c406132294790fa2fadd0380cfa7':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 00:07:02 +00:00
Jason Monk
a349a9e71a am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:53 +00:00
Jason Monk
3b4ccabc06 am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
automerge: 65c08ec

* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:21 +00:00
Winson Chung
b4854456c0 am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 
* commit 'e405e59e5b10aaf64c5f10e1336f43e092ce390b':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 00:03:21 +00:00
Alan Viverette
3ad771b384 Update tint filter after setting gradient drawable state 
BUG: 18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
 2014-12-10 16:00:43 -08:00
Jim Miller
a5faf2415d Attempt to fix keyguard missing bug 
This attempts to fix a bug where the device sometimes shows the home screen
before keyguard starts.  The fix ensures we show the scrim when KeyguardServiceDelegate
is created and stays there until KeyguardService connects.

Fixes bug 18468369

Change-Id: Ib560889663c0c4dd84135d949fefc2b9819ce9a1
 2014-12-10 15:59:43 -08:00
Winson Chung
e405e59e5b Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 2014-12-10 23:54:40 +00:00
smain@google.com
e04a9fcc2e am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
* commit 'c0f96532caa62f477af33a271b546a7d0c932c36':
  add helpouts widget to wave 3 pages
 2014-12-10 23:49:17 +00:00
smain@google.com
c0f96532ca am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
* commit '8cd0bb2df377b2452d5b12ac5057143da4ecb899':
  add helpouts widget to wave 3 pages
 2014-12-10 23:37:52 +00:00
Shishir Agrawal
960dccebf5 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 
automerge: 951dcdd

* commit '951dcdd9404054f6b7e794b18aad6f50e44732f9':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-10 23:36:24 +00:00
Chris Craik
5369b76963 resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. 
Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
 2014-12-10 15:23:54 -08:00
Shishir Agrawal
951dcdd940 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 2014-12-10 23:19:16 +00:00
Amith Yamasani
a2530e4aa4 am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'ee24d848a5f270fb2d18150ab14200e62c9fd118':
  Stop guest user on exiting, to conserve resources
 2014-12-10 23:18:26 +00:00
Winson Chung
2002cf5b46 Fixing major regressions in Recents with multi-user. (Bug 18574950) 
In the process of front-loading a lot of the loading work, we moved logic
into AlternateRecentsComponent, which is not multi-user friendly.  This CL 
proxies all the necessary events for non-primary users to their own SystemUI 
process to ensure that they handle them correctly, and proxies visibility
changes back to the primary user (since that is the only process with the
right callbacks).

Change-Id: I9fed92214ac4d4e2309ad6ffc35d09b5726c2880
 2014-12-10 15:16:55 -08:00
smain@google.com
8cd0bb2df3 Merge "add helpouts widget to wave 3 pages" into lmp-docs 2014-12-10 23:07:38 +00:00
Amith Yamasani
ee24d848a5 Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 2014-12-10 22:54:29 +00:00
Dmitriy Ivanov
2b0f2dbefb am cd13ae76: Merge "Switch to libsigchain.a" into lmp-mr1-dev 
* commit 'cd13ae76a54a2cd7f20730579486834c326fa272':
  Switch to libsigchain.a
 2014-12-10 22:31:40 +00:00
Dmitriy Ivanov
cd13ae76a5 Merge "Switch to libsigchain.a" into lmp-mr1-dev 2014-12-10 22:24:46 +00:00
Amith Yamasani
6f96a44df3 Stop guest user on exiting, to conserve resources 
Bug: 18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
 2014-12-10 14:21:48 -08:00
Luan Nguyen
75ec24e269 am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. 
* commit '7e1b348ac55d4368172809031808a39576d00eea':
  docs: Fix link for moved Android Studio index.
 2014-12-10 22:12:20 +00:00
Alan Viverette
7171bf40ec am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '6c42ee470307eee56a21062ad67b67878aa9392d':
  Always call onDateChanged() when the date picker selection changes
 2014-12-10 22:12:04 +00:00
Alan Viverette
6c42ee4703 Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 2014-12-10 22:06:19 +00:00
Luan Nguyen
7e1b348ac5 am 4221d7e4: docs: Fix link for moved Android Studio index. 
* commit '4221d7e4cbcea9ea6be56322c7839f31b2afb828':
  docs: Fix link for moved Android Studio index.
 2014-12-10 22:04:20 +00:00
Dianne Hackborn
dc1e9f4813 am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'e207ffe01d3e9185f2cac9501354a5236abcedad':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-10 21:59:39 +00:00
Alan Viverette
3d517a701c am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '62b780e85ff2fcefd4324c3bfbf49b14963cf58b':
  Avoid creating futures for drawables with no constant state
 2014-12-10 21:59:32 +00:00
Dianne Hackborn
e207ffe01d Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 2014-12-10 21:56:08 +00:00
Alan Viverette
62b780e85f Avoid creating futures for drawables with no constant state 
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.

Rider: Also fixes elevations again.

BUG: 18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
 2014-12-10 13:52:28 -08:00
Luan Nguyen
4221d7e4cb docs: Fix link for moved Android Studio index. 
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
 2014-12-10 13:42:05 -08:00
Adam Lesinski
740acf213c am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit 'c78018774503308e8c8266f6769c9e4c895f3a97':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-10 21:19:58 +00:00
Adam Lesinski
c780187745 Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 2014-12-10 21:12:04 +00:00
Jason Monk
65c08ec82a am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
  Handle policy change while keyguard disabled
 2014-12-10 21:11:30 +00:00
Jason Monk
4ef9edeb67 Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 2014-12-10 21:04:27 +00:00