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

152866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
7a058d4c5e Update text appearance in leanback setup 
Changes the size and inter-line spacing.

bug:16959057
Change-Id: Iaf3dcb6c60d071920d73ac2f86e01b6d4248ebf9
 2014-09-11 10:03:27 -07:00
Jon Larimer
26a401987a am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '9d8da659ceb3989932e02b9342e5a6db06881030':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:54:33 +00:00
Amith Yamasani
d12c36d7b6 am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
  Apply cross-user restrictions to Shell
 2014-09-11 16:53:56 +00:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call 
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
 2014-09-11 09:49:45 -07:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
Jon Larimer
9d8da659ce am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'd65ab587052934c42769b2d4cf8ec5fa70ef13f8':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:44:26 +00:00
ztenghui
987c7e0967 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:44:17 +00:00
ztenghui
3b7191b8f0 am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev 
* commit 'e1264a884e41d46828688edc226208e4dacaa047':
  Re-triangulate the spot shadow.
 2014-09-11 16:44:12 +00:00
Jon Larimer
d65ab58705 am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:33:07 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
ztenghui
ca517b97e0 Merge "Re-triangulate the spot shadow." into lmp-dev 2014-09-11 16:32:05 +00:00
Jon Larimer
e2b12b1fbc am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:23:39 +00:00
Jean-Michel Trivi
aaed97c369 am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 
* commit '8c57b9e97676180a6da299165a2f6f445c84cfd4':
  More android.media.AudioFormat.Builder javadoc
 2014-09-11 16:22:21 +00:00
Alexandra Gherghina
fd913eca07 am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:22:14 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Jon Larimer
61c6ff7b70 Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 2014-09-11 16:15:25 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
7dddf9fc11 am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
  Replace TreeSet with HashSet.
 2014-09-11 16:06:16 +00:00
George Mount
70c2c0e7b1 am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:06:11 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet. 
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
 2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
5da068b027 am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 15:53:21 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Yohei Yukawa
a0466b6ffb am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 
* commit '293e50073ab11b2cdb16aac5d9df561dc87bbdf5':
  Enrich test cases when enabling default IMEs part 3
 2014-09-11 15:38:52 +00:00
Baligh Uddin
5c9512e6e3 am 77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '77522e5137edb8ff175dd033ee80299cbd87bb38':
  Import translations. DO NOT MERGE
 2014-09-11 15:38:47 +00:00
Baligh Uddin
ee1d360bf8 am efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'efef31334deb579588009c9d8789c43a2324a992':
  Import translations. DO NOT MERGE
 2014-09-11 15:38:43 +00:00
Yohei Yukawa
e5fe4bc96d Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 2014-09-11 15:32:16 +00:00
Baligh Uddin
ef9517f019 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:31 +00:00
Baligh Uddin
356a11a557 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:13 +00:00
Alexandra Gherghina
f44d8d72c1 am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
  Remove package level intent forwarding.
 2014-09-11 15:24:44 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Yohei Yukawa
d77adfe52d Enrich test cases when enabling default IMEs part 3 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- A dummy Hinglish IME ("en_US" + "hi") is added
- Added test cases where system locale is "en_GB",
  "en_IN", and "hi" as well as "en_US".

BUG: 17347871
Change-Id: Iacf0f47c4dbc147f8153df50ba58fc4da4dacd29
 2014-09-12 00:07:41 +09:00
Marcin Kosiba
0f3a5a6559 Don't use reflection when generating the onResourcesLoaded callback. 
BUG: 17466240
Change-Id: I74608f3d8b3617281639a9d387face97e15fb616
 2014-09-11 16:02:13 +01:00
Yohei Yukawa
1ce85f0693 am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 
* commit '163c3d9aa2e15c8e7d5415ce927362a7bc752d85':
  Enrich test cases when enabling default IMEs part 2
 2014-09-11 14:59:50 +00:00
Yohei Yukawa
91f49ed13c Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 2014-09-11 14:50:01 +00:00
Yohei Yukawa
bca817b2e2 Enrich test cases when enabling default IMEs part 2 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isSystemReady == false is now coverted.
- tests can run even when the system locale of test
  environment is different from "en_US"

BUG: 17347871

Change-Id: I9434270735d3b37d8b788d41250b23d7950aaeed
 2014-09-11 23:44:43 +09:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Paul Jensen
8f776b0c0f am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit 'c1dad5c2e953535f61a6438a13cee40088786d58':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 13:23:31 +00:00
Paul Jensen
204dc65f37 Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 2014-09-11 13:15:22 +00:00
Paul Jensen
c5297d2030 am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '7f1343eec6a94092236044381b92d8085605ee4f':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 13:08:24 +00:00
Paul Jensen
5236971bbf Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 2014-09-11 12:57:33 +00:00
Jorim Jaggi
432c04140e am 840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev 
* commit '840b03dec0630486675cf6fb5f412362ed7b0d37':
  Don't use layers when fading between public/private layout
 2014-09-11 12:47:09 +00:00
Jorim Jaggi
68a7bd4933 am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit '7a09459352d0f37380d2552b8a90834c4073fa63':
  Fix inconsistent layout param in notification
 2014-09-11 12:47:05 +00:00
Jorim Jaggi
8353e76a99 Merge "Don't use layers when fading between public/private layout" into lmp-dev 2014-09-11 12:41:26 +00:00
Jorim Jaggi
0cf327daf3 Merge "Fix inconsistent layout param in notification" into lmp-dev 2014-09-11 12:40:04 +00:00
Selim Cinek
2205360300 am 2b304948: Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev 
* commit '2b304948e68a5bfe372a43b5dae3abb89eb3903e':
  Fixed a crash when the more card or the dismissview was longpressed
 2014-09-11 12:27:17 +00:00
Selim Cinek
d77d820ed7 am 31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev 
* commit '31ffc0d6315a8a4f14c7d1f167e04cf03bec6774':
  Fixed a bug where the drag down animation was behaving wrong
 2014-09-11 12:27:12 +00:00
Selim Cinek
a2be50de6a am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev 
* commit 'e4de3fbe2ff869ed904bbfaf54903b9095cb7206':
  Fixed a bug where the notifications and the clock could jump
 2014-09-11 12:27:05 +00:00
Selim Cinek
72eda1729a Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev 2014-09-11 12:20:21 +00:00