Commit Graph

47675 Commits

Author SHA1 Message Date
Esteban Talavera
cdf1bd3da4 am fb70be1d: am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users.
* commit 'fb70be1d1fbe659578dd0dd3c32e01da12ac5b08':
  New AccountManager method to copy accounts between users.
2014-11-14 19:19:52 +00:00
Sander Alewijnse
25e9dbc4cf am 75f79bc0: am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
* commit '75f79bc08b5d8c2cfe999f1dfd0d1d880c58ff93':
  Add extra to enable device admins to skip removal of system apps.
2014-11-14 19:19:36 +00:00
Alan Viverette
b7fbcefcec am db3aa6be: am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
* commit 'db3aa6be933b732c57e7e124f40388b0695a3638':
  Account for window bounds in accessibility view click point computation
2014-11-14 19:18:32 +00:00
Alan Viverette
3cad91aa5c am 8f5de8c6: am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
* commit '8f5de8c6c0d5da3c81670b72d5b412acea502d22':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 19:17:09 +00:00
ztenghui
2f96e233de am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
  Fix the starting pen's position when a path close.
2014-11-14 19:17:00 +00:00
Abhijith Shastry
e3435feed4 am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
  new sms/mms carrier app API
2014-11-14 19:16:33 +00:00
Esteban Talavera
fb70be1d1f am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users.
* commit '95162ad2eaa45cf2643b564c7fd03bfe0e4844de':
  New AccountManager method to copy accounts between users.
2014-11-14 11:42:48 +00:00
Esteban Talavera
95162ad2ea am 22dc3b7b: New AccountManager method to copy accounts between users.
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
  New AccountManager method to copy accounts between users.
2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1 New AccountManager method to copy accounts between users.
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.

Also an extra in the public api to identify the account to migrate
during provisioning.

Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
2014-11-14 11:09:27 +00:00
Sander Alewijnse
75f79bc08b am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
* commit '7bec28c5a1e1c0787542930ed291f5aadfee6e75':
  Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:38:44 +00:00
Sander Alewijnse
7bec28c5a1 am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
  Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06 Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 2014-11-14 10:26:38 +00:00
Alan Viverette
db3aa6be93 am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
* commit '04bea0905724e24ce8b80187134e7f698607ae1a':
  Account for window bounds in accessibility view click point computation
2014-11-14 01:56:50 +00:00
Alan Viverette
04bea09057 am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
  Account for window bounds in accessibility view click point computation
2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2 Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 2014-11-14 01:46:01 +00:00
Simranjit Singh Kohli
c4d583cd24 am adc62efb: am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
* commit 'adc62efba6ec60ad216de16875e0ac3b42c41f93':
  [RemoveAccount API]: Adding support for intent.
2014-11-14 00:50:15 +00:00
Wale Ogunwale
1166443a48 am 44217507: am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
* commit '442175076fbd969ee1cda7e64f0d03b4a820262f':
  Cancel or drop key events if activity is stopped.
2014-11-14 00:47:35 +00:00
Adam Powell
4aa1ca3c5d am 31de5dbe: am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
* commit '31de5dbe1ed32a611a8ba0e132570359cd7956c9':
  Optimize setting padding and backgrounds for views
2014-11-14 00:45:40 +00:00
Ignacio Solla
7617704dfa am b993a4c7: am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
* commit 'b993a4c70b55344d35b0435cd3cdbb29c3a50809':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-14 00:43:27 +00:00
Alexandra Gherghina
0735d09ada am a3b4ab20: am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
* commit 'a3b4ab20156a06ffecb76e82852f904db3a39473':
  Add extra for account migration in the DevicePolicyMamager
2014-11-14 00:43:17 +00:00
Narayan Kamath
6266d743b8 am cb313d1a: am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
* commit 'cb313d1a61ab6fa7ad4cb8e264348cfb2b8a3270':
  Add detailed javadoc for AssetManager.getLocales.
2014-11-14 00:43:09 +00:00
Jeff Brown
0624d611c0 am 36ed36a2: am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
* commit '36ed36a2ea263439257b3978f6e8c787a3544952':
  Make Message.setAsynchronous() public.
2014-11-14 00:43:03 +00:00
Alan Viverette
8f5de8c6c0 am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 00:03:27 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
2014-11-14 00:03:16 +00:00
Abhijith Shastry
0f0642075e am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
* commit '530f25d629f0e78ca2e0cd372e907207d2318182':
  new sms/mms carrier app API
2014-11-14 00:02:51 +00:00
Alan Viverette
96dacf3659 am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
* commit '24859ba016f740c16113e04271ebe6b3eb61a241':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-13 23:53:13 +00:00
ztenghui
9f67155332 am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit '475569e98a7d8d42b981df54c70974ad99336328':
  Fix the starting pen's position when a path close.
2014-11-13 23:53:03 +00:00
Abhijith Shastry
530f25d629 am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
  new sms/mms carrier app API
2014-11-13 23:50:12 +00:00
Alan Viverette
24859ba016 Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 2014-11-13 22:45:12 +00:00
ztenghui
475569e98a Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev 2014-11-13 22:41:55 +00:00
Abhijith Shastry
fb8db1c84b Merge "new sms/mms carrier app API" into lmp-mr1-dev 2014-11-13 22:15:46 +00:00
Alan Viverette
df68999dc7 Don't dismiss AutoCompleteTextView on focus change while temp detached
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.

BUG: 18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
2014-11-13 12:59:37 -08:00
ztenghui
5e7a29f677 Fix the starting pen's position when a path close.
We have to cache the starting point for the latest "move", then apply it after
we close the path.

b/18214929

Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
2014-11-13 12:55:16 -08:00
Simranjit Singh Kohli
adc62efba6 am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
* commit '91b5550ee724bf0e41149decd55fd9ca2a3b3797':
  [RemoveAccount API]: Adding support for intent.
2014-11-13 19:32:47 +00:00
Wale Ogunwale
442175076f am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
* commit '21f16a475d0a212f9d3fb36659de5a59c2f80484':
  Cancel or drop key events if activity is stopped.
2014-11-13 19:26:57 +00:00
Simranjit Singh Kohli
91b5550ee7 am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
  [RemoveAccount API]: Adding support for intent.
2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 2014-11-13 19:18:30 +00:00
Wale Ogunwale
21f16a475d am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
  Cancel or drop key events if activity is stopped.
2014-11-13 19:07:19 +00:00
Adam Powell
31de5dbe1e am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
* commit 'e2820ed9636368884b09347ce49658757b696b71':
  Optimize setting padding and backgrounds for views
2014-11-13 19:03:37 +00:00
Wale Ogunwale
28d3c245a1 Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 2014-11-13 19:00:07 +00:00
Adam Powell
e2820ed963 am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
  Optimize setting padding and backgrounds for views
2014-11-13 18:57:43 +00:00
Sander Alewijnse
8c41156178 Add extra to enable device admins to skip removal of system apps.
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
2014-11-13 18:16:28 +00:00
Adam Powell
87bc2acfd3 Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 2014-11-13 18:12:54 +00:00
Rob Tsuk
95e5a82e1d Merge "Add a way to override Xfermode" 2014-11-13 17:17:06 +00:00
Ignacio Solla
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-13 15:20:29 +00:00
Alexandra Gherghina
a3b4ab2015 am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
* commit 'fca2575bffc8bee495cede445849e0183aa9ab51':
  Add extra for account migration in the DevicePolicyMamager
2014-11-13 15:15:44 +00:00
Narayan Kamath
cb313d1a61 am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
* commit '856a0d06a64b5aebaf2afcc477bfc82308de7c9a':
  Add detailed javadoc for AssetManager.getLocales.
2014-11-13 15:15:34 +00:00
Jeff Brown
36ed36a2ea am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
* commit '4d9bd1516f7d495ee16bcfeca95a2ab45e33de4c':
  Make Message.setAsynchronous() public.
2014-11-13 15:15:28 +00:00
Ignacio Solla
f3bd15cf80 am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
  Add extra for account migration in the DevicePolicyMamager
2014-11-13 15:08:01 +00:00