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

150438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
da84da1e2e am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '31d0207abfbfe15a63028010e0d5230268b94a52':
  Clear pending operation flag when move failed.
 2014-08-27 18:05:28 +00:00
Jeff Sharkey
d1caf731e4 Merge "Clear pending operation flag when move failed." into lmp-dev 2014-08-27 17:58:17 +00:00
Amith Yamasani
0d140b5f4a am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit 'e656975cb7be7e883badf3257a2d66b6e664f5e0':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 17:52:15 +00:00
Craig Mautner
d28e611436 am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'b46e78f9e04dc7a292be2a3f50d72dc453a2891b':
  Revert "Debug for 13924095."
 2014-08-27 17:40:57 +00:00
Amith Yamasani
032402cff1 Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 2014-08-27 17:39:29 +00:00
Amith Yamasani
e084039dd2 Fix incorrect reading of multichoice app restrictions 
Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
 2014-08-27 10:33:17 -07:00
Craig Mautner
d4b325a82b Merge "Revert "Debug for 13924095."" into lmp-dev 2014-08-27 17:29:58 +00:00
Jeff Sharkey
1c9edafef8 Clear pending operation flag when move failed. 
Bug: 17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
 2014-08-27 10:24:59 -07:00
Craig Mautner
6405a2b879 am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'a1ca6e00143dfe8f62c4f888ad8cac79be41d5b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:20:31 +00:00
Christopher Tate
00568d35f4 am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit '96c097737bf7874b240f86b313d561fe1f14678e':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:20:26 +00:00
Craig Mautner
d266368435 Merge "When adding an apptoken skip over removed ones." into lmp-dev 2014-08-27 17:14:18 +00:00
Craig Mautner
4e1b6a4e59 Revert "Debug for 13924095." 
This reverts commit 76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.

Logspam no longer useful, just annoying now.

Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
 2014-08-27 10:07:55 -07:00
Christopher Tate
eee0ea201f Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 2014-08-27 17:06:13 +00:00
Julia Reynolds
3dbf82f033 am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'e21130fde2bc10068620d61c5b87ec4ddcc87760':
  Limit the settings profile/device owners can update.
 2014-08-27 16:58:26 +00:00
Craig Mautner
01f79cf916 When adding an apptoken skip over removed ones. 
App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.

Fixes bug 15751591.

Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
 2014-08-27 09:56:02 -07:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Makoto Onuki
4650b32856 am d37368bf: Address API review comments: 
* commit 'd37368bf06dcaf8956cf69198636562b3043d182':
  Address API review comments:
 2014-08-27 16:42:10 +00:00
Joe Fernandez
4327228c20 am 37bd72c6: am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '37bd72c6b74131305ea90af2308afd1aed7b2b98':
  docs: add warning to redirects file
 2014-08-27 16:42:06 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Raph Levien
1ebf8d619f am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit 'b73047ffc83d9858677e2174c04697502c9d854c':
  New weight-aware font config
 2014-08-27 16:28:09 +00:00
Joe Fernandez
67a8aae3c8 am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '402282f3b5c544a40cc9e19a4c37bfe5277da0ce':
  docs: add warning to redirects file
 2014-08-27 16:28:07 +00:00
Raph Levien
f1800dcfee am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit '145f5780fabc99b36532d4f57a5c99c7eb727d2c':
  Fix incorrect return value on missing glyph
 2014-08-27 16:28:05 +00:00
Ricardo Cervera
003f88ae7b am b37b252a: am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'b37b252ab8069f7e5442fdcc499334de73ceb0cc':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:28:01 +00:00
Ricardo Cervera
6a19e7464b am d3288173: am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit 'd32881732588677f0c6985d11e7e1ef120b9c6c7':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:27:52 +00:00
Raph Levien
772d576b97 Merge "New weight-aware font config" into lmp-dev 2014-08-27 16:24:37 +00:00
Raph Levien
2a5fab9d47 Merge "Fix incorrect return value on missing glyph" into lmp-dev 2014-08-27 16:24:14 +00:00
Ricardo Cervera
39ce6ba27e am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd7a3ae3835cb48289dfacb3215594550a9bd8969':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:22:14 +00:00
Baligh Uddin
8364cea60a am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7f74dffc181e4cd2d237d85ef29f2bd6a04964da':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:08 +00:00
Baligh Uddin
26b0882a7d am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd87aa19b12056d5e9dafc0dd8d34204d9b1bfc05':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:04 +00:00
Baligh Uddin
43d650b732 am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '550578f574fc0988c43b0e19a8611f6eab2014db':
  Import translations. DO NOT MERGE
 2014-08-27 16:21:59 +00:00
Ricardo Cervera
fc2497fe00 am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '665fc3185d2bda1780ddc9074f46e11777e05405':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:17:03 +00:00
Ricardo Cervera
1794dd8b7d am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '76428e01565997f21b6a50bd82088b11f7a1ac15':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:16:55 +00:00
Joe Fernandez
402282f3b5 am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file
 2014-08-27 16:16:13 +00:00
Ricardo Cervera
665fc3185d am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'df139acff19cdbca43d9cc312653f03463e645ed':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:05:10 +00:00
Ricardo Cervera
76428e0156 am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '37e3f10174bbe0308147323e8fcdf01ae09c5622':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:05:05 +00:00
Ricardo Cervera
20ce284f54 am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit '1f6a16f1def5f09dbfa9a527ee2f33b182b5f0ef':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:05:04 +00:00
Joe Fernandez
cafad30176 am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '825211712c2af5a2b9190662adf3fc93264eefd4':
  docs: add warning to redirects file
 2014-08-27 16:04:47 +00:00
Baligh Uddin
878da52a8b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:31 +00:00
Baligh Uddin
c733367f5a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:03 +00:00
Baligh Uddin
04cb07bb6c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 15:59:58 +00:00
Joe Fernandez
825211712c Merge "docs: add warning to redirects file" into klp-modular-docs 2014-08-27 15:57:05 +00:00
Ricardo Cervera
1f6a16f1de am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'cde64643f9ff0ba3de5757520bead74d4ac52a19':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:54:29 +00:00
Ricardo Cervera
df139acff1 am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '1cf6ff306e992711c1d6682ed5d69701669fdce3':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 15:54:28 +00:00
Ricardo Cervera
37e3f10174 am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '4f0fedd5017563408436c8fa7702766a487e724f':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 15:54:25 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00
Ricardo Cervera
1cf6ff306e Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 2014-08-27 15:49:34 +00:00
Ricardo Cervera
4f0fedd501 Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 2014-08-27 15:44:27 +00:00
Ricardo Cervera
facad7d9a9 docs: Changed studio links to HTTPS from HTTP. Bug: 17295924 
Change-Id: Icafcdba235a22912780253003182479619e16ca1
 2014-08-27 08:41:52 -07:00
Ricardo Cervera
cde64643f9 am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd91deea5ec151d53e3640db791948fbe2480f433':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:40:35 +00:00
Ricardo Cervera
d91deea5ec Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 2014-08-27 15:30:41 +00:00