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

157461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
306eac5f41 am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit 'f82b029c7c47568f75eb4a7e676baf2cb61c967f':
  Check UID instead of package name when preparing VPN.
 2014-10-28 20:06:08 +00:00
Jeff Davidson
f82b029c7c Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 2014-10-28 20:00:32 +00:00
Joe Fernandez
296e0a79b9 am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '9513604cdcfe56eaca70bd5c5a4f672a2b46d1a2':
  docs: Update timing of Android Wear app review
 2014-10-28 19:35:03 +00:00
David Friedman
387675d905 am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '79c332a694691cef131d049c9f6a8ad59df37000':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:34:58 +00:00
Eric Gilmore
7e99cedb50 am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '3fc61015f51a3f8ae8516b5e31d7f867f48b6d84':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:29:43 +00:00
Quddus Chong
f44baef162 am 50631f97: am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce automerge: eb07af2 
* commit '50631f97b499ad2fc904d5d1cc13ff4c964bee60':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:29:36 +00:00
Ricardo Cervera
cf6a28f813 am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a 
* commit '989f4bfd8d06a31dbe42050ea2ce0cbadeacfbfc':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:29:28 +00:00
Joe Fernandez
9513604cdc am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
automerge: 56a8cb7

* commit '56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
  docs: Update timing of Android Wear app review
 2014-10-28 19:28:36 +00:00
David Friedman
79c332a694 am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
automerge: b648cab

* commit 'b648cabadfd73bcd3fa8b88db48007f58739300e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:27:37 +00:00
Eric Gilmore
3fc61015f5 am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
automerge: 77760e7

* commit '77760e753eb9a6c533eb2b52f228149e49356f64':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:26:43 +00:00
Quddus Chong
50631f97b4 am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
automerge: eb07af2

* commit 'eb07af2ced7aa438dca941fcde2e3ca0b338a620':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:25:57 +00:00
Ricardo Cervera
989f4bfd8d am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
automerge: be07f2a

* commit 'be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:25:10 +00:00
Joe Fernandez
56a8cb7fd1 am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '5c0ed74b3886c5765c576e9e427b93c76b37635a':
  docs: Update timing of Android Wear app review
 2014-10-28 19:22:45 +00:00
David Friedman
b648cabadf am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit 'b2d582d995622cc8379603cfadae7ee6d4163b3e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:22:40 +00:00
Eric Gilmore
77760e753e am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit '9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:22:37 +00:00
Quddus Chong
eb07af2ced am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:22:15 +00:00
Ricardo Cervera
be07f2a853 am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit 'f4e32145a214b28522d67e748c0eff74aa915bf6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:22:11 +00:00
Jason Monk
caed5a2976 Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev 
automerge: 8c01dfc

* commit '8c01dfc5af599398c1c79f87619c302e000e3353':
  QS: Bring back BT/Wi-Fi sub-panels
 2014-10-28 19:16:44 +00:00
Jason Monk
dda619395b Merge "Add hotspot icon to status bar" into lmp-mr1-dev 
automerge: 09895be

* commit '09895be87e327a7e2090c88cb4a5fc997f33103c':
  Add hotspot icon to status bar
 2014-10-28 19:15:45 +00:00
Jason Monk
8c01dfc5af Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev 2014-10-28 18:45:34 +00:00
Jason Monk
09895be87e Merge "Add hotspot icon to status bar" into lmp-mr1-dev 2014-10-28 18:27:06 +00:00
Joe Fernandez
5c0ed74b38 am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
  docs: Update timing of Android Wear app review
 2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995 am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4 am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 18:15:20 +00:00
Ricardo Cervera
f4e32145a2 am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
  docs: Add SearchXonY to Common Intents
 2014-10-28 18:15:17 +00:00
Adam Lesinski
06caf1b111 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
* commit '31b76b66b1678eb6483676aa2ef587e10b98d02a':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 17:45:13 +00:00
Jason Monk
5d325074b1 QS: Bring back BT/Wi-Fi sub-panels 
Bluetooth has stayed pretty much the same, just came back.

Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.

Bug: 17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
 2014-10-28 13:43:04 -04:00
Adam Lesinski
31b76b66b1 Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 2014-10-28 17:41:12 +00:00
John Spurlock
93e40ba6c4 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 
* commit 'ee990413b51b41e4fe8940cba703bdfb56a12018':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 17:17:03 +00:00
John Spurlock
ee990413b5 Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 2014-10-28 17:08:43 +00:00
George Mount
8a536bb4e0 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
* commit '95d520f160db65f90da56610eee1a047fb60fc4e':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 17:04:33 +00:00
George Mount
69a3dd85df am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
* commit '45b701085b8507006c07f5eb86d9f29f4ee07457':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 17:04:28 +00:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
John Spurlock
c90e6fe863 Zen: Show "(until 4:56 PM)" in exit conditions. 
Implement two-line exit conditions, display the duration + end
time on separate lines.

Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
 2014-10-28 12:57:43 -04:00
Nicolas Prevot
e86848c258 am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 
* commit 'ebee8a4d92a8e80b49feb51e9c9621c79398457c':
  Replace minimum with maximum in method description.
 2014-10-28 16:44:47 +00:00
Benjamin Franz
5852369808 am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 
* commit 'f5c00c1c1136c9752b9c0157f9eca6385d7b9448':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 16:44:42 +00:00
Jorim Jaggi
76dfffeb9f am 4eedc1d9: Fix jank when launching something from lockscreen 
* commit '4eedc1d97e5aa3bfaa60af9894cd991f9e210fc2':
  Fix jank when launching something from lockscreen
 2014-10-28 16:44:36 +00:00
Adrian Roos
4a915ab505 am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 16:44:31 +00:00
Nicolas Prevot
ebee8a4d92 Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 2014-10-28 16:33:33 +00:00
Nicolas Prevot
555f1986f1 Replace minimum with maximum in method description. 
BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
 2014-10-28 16:18:47 +00:00
Benjamin Franz
f5c00c1c11 Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 2014-10-28 16:13:05 +00:00
Jorim Jaggi
4eedc1d97e Fix jank when launching something from lockscreen 
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.

Bug: 18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
 2014-10-28 16:12:08 +00:00
Adrian Roos
288f65e381 Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 15:23:14 +00:00
Adrian Roos
98a8258dd8 am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 
* commit 'bd6f4a818ef36764eb69ef7308eb6a9bf3740138':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 14:44:28 +00:00
Adrian Roos
bd6f4a818e Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 2014-10-28 14:37:39 +00:00
Craig Mautner
2381825db4 am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 
* commit '74fe6ce72dcbc7af501022e7617528c30a0983bb':
  Do not go through a layout if visibility is GONE
 2014-10-28 14:00:54 +00:00
Craig Mautner
74fe6ce72d Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 2014-10-28 13:56:09 +00:00
Jason Monk
952d5d8d8a Add hotspot icon to status bar 
Bug: 17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
 2014-10-28 09:31:42 -04:00