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

155317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yohei Yukawa
415bd02998 am 099aa313: am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 
* commit '099aa313b45c445200f36a73ba21c01a5a9d2126':
  Enrich test cases when enabling default IMEs part 3
 2014-09-11 15:47:17 +00:00
Baligh Uddin
7986ab2956 am ea7f9e96: (-s ours) am 77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ea7f9e96c2094d622e0bbc528654435314c3299a':
  Import translations. DO NOT MERGE
 2014-09-11 15:47:12 +00:00
Baligh Uddin
331d8415a5 am 6aaeda33: (-s ours) am efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6aaeda331b1ff0ba36e36ea3c69c2ea3aa8c18cc':
  Import translations. DO NOT MERGE
 2014-09-11 15:47:07 +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
Alexandra Gherghina
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
 2014-09-11 15:36:21 +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
bbd04186df am 6eadedcc: am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 
* commit '6eadedcc98fd2355c4b5324d24303a833a61e968':
  Enrich test cases when enabling default IMEs part 2
 2014-09-11 15:08:40 +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
da7835d5c3 am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '576fc3ca6bdd5ffe606d3e36f6b8114530642d3e':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 13:34:08 +00: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
f4f38caa29 am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '09ff9d7e9823accbee65f3e44be13e8e7d9d5842':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 13:17:47 +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
Jorim Jaggi
aed92ba835 am 3b30c486: am 840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev 
* commit '3b30c48698a827c2f75caf85c3316cc7f79a7f51':
  Don't use layers when fading between public/private layout
 2014-09-11 12:58:34 +00:00
Jorim Jaggi
0e9710d3c5 am 0d58a4a2: am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit '0d58a4a274dec11ec465629522c20ccf45ce9020':
  Fix inconsistent layout param in notification
 2014-09-11 12:58:30 +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
b85a6f148a am d603388f: am 2b304948: Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev 
* commit 'd603388fe4a5c6ddd982a561cf1d233b79a9bfde':
  Fixed a crash when the more card or the dismissview was longpressed
 2014-09-11 12:37:05 +00:00
Selim Cinek
37e5cda521 am 52fe1c77: am 31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev 
* commit '52fe1c777b5deb99d97ee7ce7420053cdcaed94f':
  Fixed a bug where the drag down animation was behaving wrong
 2014-09-11 12:37:00 +00:00
Selim Cinek
d1da4d098c am 4e523094: am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev 
* commit '4e523094e9b440958c6eb29ea515b3187b4e195f':
  Fixed a bug where the notifications and the clock could jump
 2014-09-11 12:36:56 +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
de3221e748 am e3b6a5bd: am db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev 
* commit 'e3b6a5bd093b4ebfef01f15005c25ae9dc2f6b4b':
  Fix: always allow getProviderMimeType within the same user.
 2014-09-11 09:47:30 +00: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
vandwalle
5df82ba65b add option to link only same credential configurations 
Change-Id: I438b753974d3215ec7961628a0b4ddc4c3136c0b
 2014-09-11 02:21:13 -07:00
Yohei Yukawa
dd41c8aee8 am 67ead584: am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev 
* commit '67ead5844e21c14f274fd561c98f3ff0017863a1':
  Enrich test cases when enabling default IMEs
 2014-09-11 07:12:32 +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