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

91664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
d8a9a77537 am f66bf0e8: am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit 'f66bf0e86790e5864bb018b2fa778456ea561e68':
  resolve conflicting assumptions from the merge.
 2012-10-11 17:52:35 -07:00
Dave Burke
6e9cb82eeb am d4aa3b68: am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit 'd4aa3b68940e5aaf2883f7a63bc50924590d373a':
  Add new ringtones/notifications for Occam.
 2012-10-11 17:52:31 -07:00
Danielle Millett
8bb1f5abc4 am 855bdf65: am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '855bdf6500edfc4496002367638c577318b0b912':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:52:28 -07:00
Daniel Sandler
972e834943 am bfd97573: am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit 'bfd97573053ab549b1815ed75e5f72cc8c965e4c':
  New icon for quick settings button.
 2012-10-11 17:52:24 -07:00
Svetoslav Ganov
7510e4820b resolved conflicts for merge of a7f38925 to master 
Change-Id: If0e3a1046dfeef9260284e84f2a74525ddea00f7
 2012-10-11 17:49:28 -07:00
Jeff Sharkey
98a8a3552d am e0fec434: am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit 'e0fec43459ded4f304d6bd3d8f07e3acedcb5a11':
  Database cleanup needs to happen for all users.
 2012-10-11 17:18:42 -07:00
Adam Cohen
1c3bbfc7a4 am 68794263: am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '6879426372c707d1b67cff549fae523621884304':
  Final keyguard tablet layout integration
 2012-10-11 17:18:37 -07:00
Svetoslav Ganov
6fdd3176e6 am 02942145: am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit '0294214519df70978b5440b01ec6c2597f4eecec':
  Send accessibility event for content change upon setting content description.
 2012-10-11 17:18:33 -07:00
Daniel Sandler
37a6049782 am 8c17d23e: am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '8c17d23e41d7f53966bbcbfcc51229d33d2837d5':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 17:18:29 -07:00
Dianne Hackborn
b10d82597b am fc31380a: am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'fc31380adf4272c11bc32fab1dcea75804ad3166':
  More on issue #7318666: hide developer options from user build
 2012-10-11 17:18:25 -07:00
Satoshi Kataoka
bc58774037 am 95189b92: am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '95189b92259529997cfa4d15b5ffd060d9f99a51':
  Don't update the text services locale in the main thread
 2012-10-11 17:18:18 -07:00
Baligh Uddin
93c6a19ffb am 31f3d527: (-s ours) am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '31f3d527baea67073a509fda4b3063f58b2aebce':
  Import translations. DO NOT MERGE
 2012-10-11 17:18:11 -07:00
Chris Wren
f66bf0e867 am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit 'a35f8ce39ff86e8ad1ce905ba58112d7e2f8684a':
  resolve conflicting assumptions from the merge.
 2012-10-11 17:12:10 -07:00
Dave Burke
d4aa3b6894 am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit '950407d09e02181af7553690418f304da417f372':
  Add new ringtones/notifications for Occam.
 2012-10-11 17:12:03 -07:00
Danielle Millett
855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:11:50 -07:00
Daniel Sandler
bfd9757305 am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit '22cc5c76d08bbd1017d06f0157b6801b7c38870c':
  New icon for quick settings button.
 2012-10-11 17:11:43 -07:00
Svetoslav Ganov
a7f38925f7 am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 
* commit 'd3e5180f7cec9df97e983f228aa753efcd193013':
  Prevent out of range magnification scale to be persisted.
 2012-10-11 17:11:37 -07:00
Jeff Sharkey
e0fec43459 am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit '1cf5bd2aeb983e09e7e4b664b1380c30b94b4d50':
  Database cleanup needs to happen for all users.
 2012-10-11 17:11:19 -07:00
Adam Cohen
6879426372 am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
  Final keyguard tablet layout integration
 2012-10-11 17:11:13 -07:00
Svetoslav Ganov
0294214519 am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit 'a1489d302289e92e7135452db3fee446e2452535':
  Send accessibility event for content change upon setting content description.
 2012-10-11 17:11:09 -07:00
Daniel Sandler
8c17d23e41 am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '09a4a4c29c42ddb7c515a10911db108f77de2e0c':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 17:11:02 -07:00
Dianne Hackborn
fc31380adf am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
  More on issue #7318666: hide developer options from user build
 2012-10-11 17:10:54 -07:00
Satoshi Kataoka
95189b9225 am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
  Don't update the text services locale in the main thread
 2012-10-11 17:10:50 -07:00
Baligh Uddin
31f3d527ba am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bcace62f72efa7dd1722b86837af2399c9507beb':
  Import translations. DO NOT MERGE
 2012-10-11 17:10:38 -07:00
Chris Wren
a35f8ce39f am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit '061a4de86d79d3ead3f297fa3fde4692446af5e4':
  resolve conflicting assumptions from the merge.
 2012-10-11 13:08:28 -07:00
Chris Wren
061a4de86d Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 2012-10-11 13:05:36 -07:00
Dave Burke
950407d09e am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit 'a2f7ca7db1f797d7897dc66840d1ec64d1b2a6a1':
  Add new ringtones/notifications for Occam.
 2012-10-11 12:55:46 -07:00
Dave Burke
a2f7ca7db1 Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 2012-10-11 12:53:02 -07:00
Dave Burke
2882fc0f02 Add new ringtones/notifications for Occam. 
Bug: 7312457
Change-Id: Id3a3a25d412b4f1441067e0d86d2bf30e10dd1b7
 2012-10-11 12:10:41 -07:00
Danielle Millett
85a4ac9281 am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '8f89e6f8e66ab445cca16e5426a126d3798f09d9':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 12:10:02 -07:00
Danielle Millett
8f89e6f8e6 Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 2012-10-11 12:07:38 -07:00
Daniel Sandler
22cc5c76d0 am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit 'ff97e6e8412d9985938e715fcd1030adba328d4b':
  New icon for quick settings button.
 2012-10-11 11:53:05 -07:00
Daniel Sandler
ff97e6e841 Merge "New icon for quick settings button." into jb-mr1-dev 2012-10-11 11:50:22 -07:00
Svetoslav Ganov
d3e5180f7c am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 
* commit 'd07fa6e0dc8141e5e77ffec6863f81a246bf8384':
  Prevent out of range magnification scale to be persisted.
 2012-10-11 11:39:36 -07:00
Svetoslav Ganov
d07fa6e0dc Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 2012-10-11 11:37:33 -07:00
Svetoslav Ganov
ee44fae196 Prevent out of range magnification scale to be persisted. 
1. If a bad magnification scale is persisted, i.e. it is
   not between the min and max, the screen magnifier gets
   into a bad state which even a reboot does not fix since
   the scale is persisted in settings.

   This change ensures that only valid scales are presisted.
   In general a bad value should not be attempted to be
   persisted but at this point this is the safest change.

bug:7288239

Change-Id: I3e9c7c091772fa64128ab8403c2127ce65cb94b8
 2012-10-11 11:17:56 -07:00
Jeff Sharkey
1cf5bd2aeb am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit '26e3f3df8761ee3c75155ca848d29cfe820a2a8c':
  Database cleanup needs to happen for all users.
 2012-10-11 11:15:33 -07:00
Jeff Sharkey
26e3f3df87 Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 2012-10-11 11:13:30 -07:00
Adam Cohen
2514cbc218 am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit 'e60cdf1291ba01400f7d864ee3501a6762e516bd':
  Final keyguard tablet layout integration
 2012-10-11 11:10:16 -07:00
Adam Cohen
e60cdf1291 Merge "Final keyguard tablet layout integration" into jb-mr1-dev 2012-10-11 11:08:19 -07:00
Daniel Sandler
e6a69ddc67 New icon for quick settings button. 
Bug: 7319756
Change-Id: I864cc7938f94c87f5d7e18657fb6ac5f083e15d9
 2012-10-11 14:05:12 -04:00
Jeff Sharkey
8f55d11298 Database cleanup needs to happen for all users. 
Bug: 6970084
Change-Id: I9a6f1cbaf095b245ec9707a90c518256e0aa1f5f
 2012-10-11 11:00:28 -07:00
Svetoslav Ganov
a1489d3022 am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit '9aefa1457967b52f1865173aa70896db84f111f1':
  Send accessibility event for content change upon setting content description.
 2012-10-11 11:00:26 -07:00
Svetoslav Ganov
9aefa14579 Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 2012-10-11 10:57:41 -07:00
Daniel Sandler
09a4a4c29c am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '092ad66a571d95cad20003daeac4c1119352b854':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 10:49:43 -07:00
Daniel Sandler
092ad66a57 Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* changes:
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 10:47:12 -07:00
Dianne Hackborn
ff363aa967 am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit '2a3e1ffd0f1c369a39f5321a54206d36beab31b9':
  More on issue #7318666: hide developer options from user build
 2012-10-11 10:46:34 -07:00
Satoshi Kataoka
6a1d4b998c am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '8e767115a888b78c5732fe935bd811a7db6bf2e1':
  Don't update the text services locale in the main thread
 2012-10-11 10:44:55 -07:00
Dianne Hackborn
2a3e1ffd0f Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 2012-10-11 10:44:37 -07:00
Satoshi Kataoka
8e767115a8 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev 2012-10-11 10:42:32 -07:00