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

152739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Selim Cinek
9d25c97ea0 Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev 2014-09-11 12:20:07 +00:00
Selim Cinek
88619b1295 Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev 2014-09-11 12:19:37 +00:00
Jorim Jaggi
aa92ffb199 Don't use layers when fading between public/private layout 
Saves us some memory and more importantly, prevents layer trashing
and some skipped frames when building the layers.

Bug: 17287256
Bug: 16513124
Change-Id: Ief7c9a892da57bc77264de016f5118277e648f45
 2014-09-11 11:56:37 +00:00
Selim Cinek
bdefcdf90f Fixed a crash when the more card or the dismissview was longpressed 
Bug: 17460534
Change-Id: Ided33204b04085ed01f1cc6ada9ccc43fbf028d0
 2014-09-11 12:41:47 +02:00
Nicolas Prevot
9329d4c58c am db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev 
* commit 'db19c5af06c6cfa22fe62454fdbfaaf93c36a170':
  Fix: always allow getProviderMimeType within the same user.
 2014-09-11 09:34:28 +00:00
Nicolas Prevot
0ecb0c4397 Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev 2014-09-11 09:25:58 +00:00
Yohei Yukawa
dc28895d01 am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev 
* commit '92701395cfcc883683bcaf023d7b97782e5127e8':
  Enrich test cases when enabling default IMEs
 2014-09-11 07:01:46 +00:00
Yohei Yukawa
726f2fe3c9 Merge "Enrich test cases when enabling default IMEs" into lmp-dev 2014-09-11 06:53:48 +00:00
Derek Tan
aa989c794e am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 
* commit '4c8c759106eba4070a46393f2978607964881511':
  Update the comment in two APIs since we will persist the settings.
 2014-09-11 05:24:52 +00:00
Derek Tan
6d955b88c3 Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 2014-09-11 05:16:35 +00:00
Deepanshu Gupta
6accdcd1d0 am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '8d89d1e03d592561d9d8ef7a54e5697c47282b69':
  LayoutLib: support font weights.
 2014-09-11 05:04:50 +00:00
Deepanshu Gupta
820ce63cea Merge "LayoutLib: support font weights." into lmp-dev 2014-09-11 04:54:26 +00:00
Jean-Michel Trivi
103e222137 am a20c82b9: am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit 'a20c82b9b13760a432f7122790516ec5742a4dbf':
  Do not restore the media button event receiver
 2014-09-11 04:54:20 +00:00
Jean-Michel Trivi
58a8de3ff2 am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit 'e5c53e9d78eed94bd9ed55aabddf96e07c7b9a50':
  Do not restore the media button event receiver
 2014-09-11 04:43:22 +00:00
Jean-Michel Trivi
e5c53e9d78 am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '4fa904aba2d60ca8bce39b30264076d8eec7a904':
  Do not restore the media button event receiver
 2014-09-11 04:33:36 +00:00
Jean-Michel Trivi
4fa904aba2 am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '9513f81e33bc0da445735257c8de11a38f3775fa':
  Do not restore the media button event receiver
 2014-09-11 04:23:21 +00:00