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

166141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
0e33b1a2a6 Import translations. DO NOT MERGE 
Change-Id: I94ea057516c95dbc1ed583b64d69e638d14d81ee
Auto-generated-cl: translation import
 2014-10-04 14:43:55 -07:00
Adam Lesinski
f48a4d151e am 5787920f: am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit '5787920f5bbac1c7cf296b5c042daf0108dbdacc':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-04 00:42:36 +00:00
Elliott Hughes
dff75073d4 resolved conflicts for merge of 9f22aef0 to master 
Change-Id: I81f49dacc90f0f6ef3ce7b20fe88e543b383aec8
 2014-10-03 17:38:48 -07:00
Adam Lesinski
5787920f5b am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit '85035d90257beedd54641385674ce2dfb29ae241':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-04 00:01:21 +00:00
Elliott Hughes
9f22aef0c9 resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6
 2014-10-03 15:29:32 -07:00
Adam Lesinski
85035d9025 am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit 'b2b166a57ef07120d24264647951781a7f90f877':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-03 22:26:53 +00:00
Adam Lesinski
b2b166a57e am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit '397001b2a7cb184e4916688b7ecfdcdc439be818':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-03 22:17:03 +00:00
Adam Lesinski
397001b2a7 am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit 'a80aba70728c2843df94474dbd7829dadb77855f':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-03 22:10:48 +00:00
Adam Lesinski
a80aba7072 Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 2014-10-03 22:06:03 +00:00
Svetoslav Ganov
400297b874 am 04c4b5ea: am e53a3188: am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '04c4b5ea9f5aecfdb4b68025ae8c9e34e12c70dc':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:59:52 +00:00
Deepanshu Gupta
b51f59c9c7 am fe54f8a4: am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'fe54f8a4962d1b6366f98c24155432a9a45fd6b8':
  Minor style changes.
 2014-10-03 21:59:46 +00:00
Dianne Hackborn
b5596ffbbf am 2fc4d811: am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '2fc4d81113d713022c5f31d7387e7687090168b4':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:59:41 +00:00
RoboErik
021b51fa28 am 64cb3ec4: am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '64cb3ec43209e61a63b79a227cd00f848ef1bddb':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:59:36 +00:00
Christopher Tate
0462a524e3 am 24c192b8: am 354ee927: am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit '24c192b87ff7b90ce4bc7568561a230c587a4fdf':
  Fix alarm delivery-order sorting
 2014-10-03 21:59:21 +00:00
Guang Zhu
2397b67ca2 am 30fe4a4f: am fbeaa769: am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit '30fe4a4fcad48ef4ce09fe298bda5e27ad8ba301':
  Prevent monkey from triggering bugreport
 2014-10-03 21:59:15 +00:00
Dianne Hackborn
c7d1467a8b am cba999c1: am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'cba999c164d206c1fb2b7f9f2bf78e8ed616c67d':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:59:09 +00:00
Adam Lesinski
f15de2e215 AAPT: Gate v21 resource synthesizing logging behind -v flag 
This is verbose information and should be hidden behind the -v flag.

Bug:17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
 2014-10-03 14:57:28 -07:00
Svetoslav Ganov
04c4b5ea9f am e53a3188: am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit 'e53a3188365550d17422e534f6aec80249dbc447':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:52:51 +00:00
Deepanshu Gupta
fe54f8a496 am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '09714a76a9463f5e18ea8ac91ba040f6fd2235fd':
  Minor style changes.
 2014-10-03 21:52:46 +00:00
Dianne Hackborn
2fc4d81113 am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit 'd6bcda99b062eb0bb8511d7a4a1cefc23df3cb77':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:52:42 +00:00
RoboErik
64cb3ec432 am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '26c2e5a0de022e3842e65337550214c7133aa08b':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:52:37 +00:00
Christopher Tate
24c192b87f am 354ee927: am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit '354ee927db8edb36ec7a726069e137f0edd61f7f':
  Fix alarm delivery-order sorting
 2014-10-03 21:52:33 +00:00
Guang Zhu
30fe4a4fca am fbeaa769: am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit 'fbeaa769cea6a7c3ef0a7439847dc2b62d235c59':
  Prevent monkey from triggering bugreport
 2014-10-03 21:52:28 +00:00
Dianne Hackborn
cba999c164 am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:52:23 +00:00
Elliott Hughes
57ec13b298 am 1fb235aa: Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 
* commit '1fb235aa9ba032c69a93907e349a71352718f85d':
  Fix percentage formatting in SystemUI.
 2014-10-03 21:50:57 +00:00
Svetoslav Ganov
e53a318836 am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '9ae2bca49d2513007de105b199c9ffc0ca0f07d7':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:43:33 +00:00
Deepanshu Gupta
09714a76a9 am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '82e281810e0eed731a2adddc19eeb65ae73a0dea':
  Minor style changes.
 2014-10-03 21:43:28 +00:00
Dianne Hackborn
d6bcda99b0 am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02b4caf5f74b9099a56f6e1ed30460f802657f41':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:43:24 +00:00
RoboErik
26c2e5a0de am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '49c14438fd1838851726fad1bb595bfb95764b4c':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:43:20 +00:00
Christopher Tate
354ee927db am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit '33ecc6e0fca154993ffab053f33296537adfb510':
  Fix alarm delivery-order sorting
 2014-10-03 21:43:16 +00:00
Guang Zhu
fbeaa769ce am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit '9098184bd86f0d8914a951db76e192f87720eaf9':
  Prevent monkey from triggering bugreport
 2014-10-03 21:43:12 +00:00
Dianne Hackborn
e2776f02bf am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit '6b1cf642fc5bda2dfaea2571b24241bd3c2109b4':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:43:07 +00:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Svetoslav Ganov
9ae2bca49d am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '31deb67dd0c9d204bf3342b7699a240310b1cf34':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:33:16 +00:00
Deepanshu Gupta
82e281810e am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'c62da8a0ba8e230f2d759d2219673553999d9c56':
  Minor style changes.
 2014-10-03 21:33:12 +00:00
Dianne Hackborn
02b4caf5f7 am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02d758a9e83eb1da236f34a2a6b70af89941be43':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:33:08 +00:00
RoboErik
49c14438fd am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '2d553e95c9e16fd37a676acaf1960e9d919c3caf':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:33:05 +00:00
Christopher Tate
33ecc6e0fc am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit 'b5c55da5ab7e11c2bdc5ff4ba2adadb9867d46fd':
  Fix alarm delivery-order sorting
 2014-10-03 21:33:01 +00:00
Guang Zhu
9098184bd8 am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit '35eb89097f4f555dc03d4d406359a9ebfa64144d':
  Prevent monkey from triggering bugreport
 2014-10-03 21:32:43 +00:00
Dianne Hackborn
6b1cf642fc am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:32:30 +00:00
Svetoslav Ganov
31deb67dd0 am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '76716c5a180aa471c6973ca7aa03c7f2da677823':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:02:49 +00:00
Deepanshu Gupta
c62da8a0ba am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
  Minor style changes.
 2014-10-03 21:02:45 +00:00
Dianne Hackborn
02d758a9e8 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:02:42 +00:00
RoboErik
2d553e95c9 am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '7a60cdbd0989fdc262f7838b26c551a3417b7edb':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:02:38 +00:00
Christopher Tate
b5c55da5ab am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit 'b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
  Fix alarm delivery-order sorting
 2014-10-03 21:02:32 +00:00
Svetoslav Ganov
76716c5a18 Revert "TouchExplorer computes incorrectly the click location." 
This reverts commit 851a5059a47cbf76e530c9d050a677cb6e3f8657 as
it creates a regression. Let us revert this and correctly fix the
issue the original change was trying to address.

bug:17789608

Change-Id: I8abb1a61d5310430e839e4ef60e7ca5cc0cbdd80
 2014-10-03 20:37:10 +00:00
Deepanshu Gupta
c74a2b3435 Merge "Minor style changes." into lmp-dev 2014-10-03 20:30:45 +00:00
Dianne Hackborn
7caa51e6ec Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 2014-10-03 20:15:12 +00:00
RoboErik
7a60cdbd09 Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 2014-10-03 20:13:28 +00:00
Christopher Tate
b88ba912f6 Merge "Fix alarm delivery-order sorting" into lmp-dev 2014-10-03 19:56:36 +00:00