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

154208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
59e129fbc8 Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev 2014-10-02 19:28:09 +00:00
Etan Cohen
6062a09dbc Enable VoLTE on VZW 311/480 
Change-Id: I81188c2a7dfe4657d35048f7b4e76fe01803f9a1
 2014-10-02 19:13:19 +00:00
Ricardo Cervera
0825c0a70a am 96762e59: am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '96762e59b77d08b7165d39ec8d5db4a1240334b8':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:28:41 +00:00
Ricardo Cervera
96762e59b7 am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '134b62ed14b830b467423082036b3222f84f291c':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:23:46 +00:00
Ricardo Cervera
134b62ed14 am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:18:30 +00:00
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:13:55 +00:00
Rich Slogar
a3d739d874 am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '6778b81fce54882635e8e6235a052bd3af569360':
  docs: Update for Android 23.0.4
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Rich Slogar
6778b81fce am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'da5febdcb24fd74feb1341a8b0deb92089388595':
  docs: Update for Android 23.0.4
 2014-10-02 18:03:19 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
da5febdcb2 am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4
 2014-10-02 17:53:38 +00:00
Rich Slogar
74ce741315 am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4
 2014-10-02 17:44:43 +00:00
Michael Wright
4d1bb519db Merge "Add supported refresh rates for all DisplayDeviceInfos." into lmp-mr1-dev 2014-10-02 17:40:25 +00:00
Ihab Awad
4cb7274d16 Merge "Update api/current.txt" into lmp-mr1-dev 2014-10-02 17:39:08 +00:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Ihab Awad
463dcae219 Update api/current.txt 
Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
 2014-10-02 10:13:30 -07:00
Kenny Guy
27cee10057 am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit 'bdcfc01b3bff1ff1c4237dccfb90704326890bee':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 17:00:42 +00:00
Kenny Guy
bdcfc01b3b am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:55:35 +00:00
Newton Allen
94f5155d6c am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
  Fix some documentation typos.
 2014-10-02 16:52:50 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Newton Allen
c68aad9fd0 am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:47:19 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
 2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
smain@google.com
629e2f5483 am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '94f04cbe4bf5e531a74cc1cdc5b080110f47f5a5':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:10:29 +00:00
smain@google.com
94f04cbe4b am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '74c2ec3644101ce4cc96e11a851daf21bf35e174':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:06:06 +00:00
smain@google.com
74c2ec3644 Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 2014-10-02 15:02:17 +00:00
George Mount
b29b651dd5 am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:39:41 +00:00
George Mount
a590a95c4d am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:33:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Lorenzo Colitti
eef8d3eb40 am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit 'df959707ff086ae1ffe516b516bfd99ac463b803':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:18:50 +00:00
Lorenzo Colitti
df959707ff am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '7fe95529e638467b77372dcac0efe51529e3bde1':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:12:26 +00:00
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Deepanshu Gupta
70d72265b2 am 9d474197: am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '9d474197856fcfc3e6f0aee7c1139d3cf493d067':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:38:27 +00:00
Deepanshu Gupta
4ae7dbbaa0 am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '2fca3e944f263bd50e4f61049399bddf957c936c':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 09:38:24 +00:00
Deepanshu Gupta
3a86340106 am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit '81f03898e59400bb77eb6525956b06e6762b550e':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 09:38:21 +00:00
Deepanshu Gupta
16df192a2b am 4d19dc0e: am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit '4d19dc0ec185c5e3c79d49e45e2df15c803e3f05':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 09:38:18 +00:00
Deepanshu Gupta
8f1258bd08 am 6ed3fadb: am 75f2f993: am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 
* commit '6ed3fadb22c1a87c8a923a738481df057d5f8211':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
 2014-10-02 09:38:14 +00:00
Deepanshu Gupta
97a4c96fbc am 7349e63d: am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit '7349e63d112838e3c925e03b6e1f99fdb95b1f6c':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 09:38:11 +00:00
Deepanshu Gupta
6b97cb7856 am fcca8151: am d24b45c8: am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit 'fcca815162f9dc4d3ffda483d2f6da6d2a43e984':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 09:38:07 +00:00
Deepanshu Gupta
33832bfbad am 7d573818: am 42099d45: am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit '7d573818a0b05999f6f8c58c0c5785860064cb52':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 09:38:04 +00:00
Deepanshu Gupta
8308e03f06 am dd5d1fdd: am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit 'dd5d1fdd07877ead5ed7edc9ed826730f441147d':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 09:38:01 +00:00
Deepanshu Gupta
0b2d1197bc am 71412900: am 9eb0cd12: am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '71412900b724fd194d9eed2457aeaa12f7226df0':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 09:37:58 +00:00
Deepanshu Gupta
fed5977c38 am 19fe9f1b: am 82eecaf8: am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit '19fe9f1bf51521a58097374c1af336fec6548ea0':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 09:37:54 +00:00
Justin Koh
4fb046f1a0 am 90eca96f: am f7aac12e: am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit '90eca96f3ca93367545ca9c3d291a9a46b980270':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-02 09:37:51 +00:00
Andreas Gampe
d5a908299a am 1e48a1ee: am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 
* commit '1e48a1eec0a5f1d015256e38f627947105af5bac':
  Revert "Frameworks/base: Update to preloaded-classes"
 2014-10-02 09:37:47 +00:00
Deepanshu Gupta
9d47419785 am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:30:34 +00:00