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

138049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
b73afd0a1f am af4418ff: Merge "Fix more card appearance to spec from design." into lmp-preview-dev 
* commit 'af4418ffb2b5bf289f85fb91a47fc63fc36949cd':
  Fix more card appearance to spec from design.
 2014-06-04 20:51:58 +00:00
George Mount
14ec02afa0 am 46e2688a: Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev 
* commit '46e2688a20758d8529ccd3da83a0fcbbf3e8b5fb':
  Create reasonable Activity Transition defaults for quantum theme.
 2014-06-04 20:51:52 +00:00
Deepanshu Gupta
e770910162 am 9f213b1e: (-s ours) am 46c3beef: am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '9f213b1e2b2db2589cbe2f6554fd6e18ed871bad':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:43:08 +00:00
Deepanshu Gupta
1ef8b7cb3d am 3c15d8d6: (-s ours) am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit '3c15d8d6889806d0b517eec03ed6a4f8728ebc16':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:43:02 +00:00
Deepanshu Gupta
be9c94ef26 Merge "Distinguish between menus in ActionBar and popup." 2014-06-04 20:42:07 +00:00
Deepanshu Gupta
72a823b9b0 am f2862a84: (-s ours) am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:36:35 +00:00
Deepanshu Gupta
9f213b1e2b am 46c3beef: am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '46c3beefad751fde9ba44d092a947df49d94219a':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:50 +00:00
Deepanshu Gupta
3c15d8d688 am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit '14104896770dd26195cd9ccfac8c1604cb95dbc6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:46 +00:00
Deepanshu Gupta
f2862a849c am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '4da5807ce0e6a190c5e1de37297d454368906e76':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:43 +00:00
Deepanshu Gupta
46c3beefad am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3ce1ca68309231e693964824917a66f36e575fd7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:11 +00:00
Deepanshu Gupta
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:06 +00:00
Deepanshu Gupta
4da5807ce0 am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:03 +00:00
Deepanshu Gupta
3ce1ca6830 am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '0ed9d498b740273fdbcdf51f55648c23df29accc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:26:07 +00:00
Deepanshu Gupta
e4aa313821 am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:57 +00:00
Deepanshu Gupta
88c9ca28ef am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:54 +00:00
Deepanshu Gupta
0ed9d498b7 am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:52 +00:00
Deepanshu Gupta
a9e8291409 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 2014-06-04 20:20:51 +00:00
Deepanshu Gupta
d49f9b2531 am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:27 +00:00
Deepanshu Gupta
ab6c61b2dd Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev 2014-06-04 20:20:26 +00:00
Deepanshu Gupta
bac0d9ae79 Distinguish between menus in ActionBar and popup. 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit f542f28a31b38a4e454535a1fea63968811b418c)
 2014-06-04 20:16:09 +00:00
Deepanshu Gupta
328b1f9278 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:37 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +00:00
Deepanshu Gupta
dade24b491 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 2014-06-04 20:07:44 +00:00
Jorim Jaggi
15c3fd31ab am 35cfe4c1: Merge "Go back to keyguard when in SHADE_LOCKED with single tap." into lmp-preview-dev 
* commit '35cfe4c1f216f477d2c024d53a6f2c1a0d817f53':
  Go back to keyguard when in SHADE_LOCKED with single tap.
 2014-06-04 20:05:01 +00:00
Adrian Roos
b4df2f586a am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev 
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
  Ensure trust agents are only provided by platform packages
 2014-06-04 20:04:55 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Michael Wright
713059d4af Merge "Making KEYCODE_PAIRING a wakeup key." 2014-06-04 19:41:59 +00:00
Michael Wright
8ac485a303 Making KEYCODE_PAIRING a wakeup key. 
Bug: 15430207
Change-Id: I4bb862e22d32af1a89741d39a694b790aa52dfcd
 2014-06-04 12:38:18 -07:00
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Deepanshu Gupta
b1ca2a0c7f am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:34:15 +00:00
Deepanshu Gupta
f52fcc7054 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 2014-06-04 19:31:31 +00:00
John Spurlock
69085a6bda am 50246b7f: Merge "QuickSettings: Filter signal assets with color filter." into lmp-preview-dev 
* commit '50246b7f8812e1bc7a9d961e5251d1bac4415d02':
  QuickSettings: Filter signal assets with color filter.
 2014-06-04 18:57:03 +00:00
John Spurlock
a28c27c5ff am 9ffa855f: QuickSettings: Remove outlined version of location icon. 
* commit '9ffa855fd9e9fd1e44b53a5a9dbfb9fd51d2b079':
  QuickSettings: Remove outlined version of location icon.
 2014-06-04 18:56:58 +00:00
Robert Greenwalt
a995aba36f Merge "Report new network scores back to factories." 2014-06-04 18:48:44 +00:00
Lorenzo Colitti
ebdba2e678 am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev 
* commit '7a3077a9a7405048b9cd28452efbc28a857acb25':
  Make requests for restricted networks not require unrestricted access.
 2014-06-04 18:46:31 +00:00
Baligh Uddin
9a17a75920 am 69600869: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '696008695b30e9e6baf13f5e5100ec8fda9bc65f':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:21 +00:00
John Spurlock
c0e4e255a3 am d4ac66cc: QuickSettings: Tile label string updates. 
* commit 'd4ac66cc168f26cf89eafe2e506c631121ac27fd':
  QuickSettings: Tile label string updates.
 2014-06-04 18:46:14 +00:00
Baligh Uddin
a877eb1e5f am c4f11b67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'c4f11b67af23dd4290864efdd1e0cb313273f207':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:09 +00:00
Baligh Uddin
8d439c5277 am 99b270af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '99b270af17fc5dccce90d2aa29e1498ee39de802':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:04 +00:00
John Spurlock
733ae473e7 am b0570a49: Merge "QuickSettings: System accent color for seekbars." into lmp-preview-dev 
* commit 'b0570a49353d696da69d3bb19216190613075981':
  QuickSettings: System accent color for seekbars.
 2014-06-04 18:45:32 +00:00
Alan Viverette
7820b7bf5d am 4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev 
* commit '4dd60289af766c9a256b57a3d1a8662131d28230':
  Fix RadialTimePicker styling
 2014-06-04 18:45:24 +00:00
Adam Powell
0662025216 am 379b49bb: Fix some brain itch. 
* commit '379b49bbc5088320d6f8f2fce88a70b458e80cf7':
  Fix some brain itch.
 2014-06-04 18:45:19 +00:00
Alan Viverette
90efa8f08c am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev 
* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
  Fix action bar menu inflation context
 2014-06-04 18:45:10 +00:00
Adam Powell
a649e8def9 am 5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev 
* commit '5519852e01a646af65efeee30f5b8e80c2cd87e7':
  Implement action bar tab mode for Toolbar-based decor action bars
 2014-06-04 18:45:04 +00:00
Robert Greenwalt
52dea94557 am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev 
* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.
 2014-06-04 18:44:59 +00:00
Winson Chung
616ec9d368 am 11aef2b8: Merge "Fixing back regression in Recents." into lmp-preview-dev 
* commit '11aef2b8caddc5aaf573ab52128a8bdb2afe37d1':
  Fixing back regression in Recents.
 2014-06-04 18:44:54 +00:00
Igor Murashkin
da525e542b am 1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 
* commit '1a68eb968f77af341a60708b85072ae805e6dc10':
  camera2: Implement most of CameraCaptureSession
 2014-06-04 18:44:46 +00:00