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

35222 Commits

Author SHA1 Message Date
Adam Cohen
0114639dea am c546c40d: am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev 
* commit 'c546c40da84a7576e3f5b2cc1441edf02b6d0df2':
  Fixing up keyguard widget pager layouts
 2012-10-02 11:33:50 -07:00
Adam Cohen
c546c40da8 am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev 
* commit 'bebefaac17801a375244fca0ae856f4c2f56f702':
  Fixing up keyguard widget pager layouts
 2012-10-02 11:31:24 -07:00
Adam Cohen
bebefaac17 Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev 2012-10-02 11:29:14 -07:00
Daniel Sandler
416e348765 am ba860e64: am b531c81c: Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev 
* commit 'ba860e6419fb6119ca6a66f7da2d444ff6a19926':
  Introduce ACTION_QUICK_CLOCK for the QS time tile.
 2012-10-02 10:59:27 -07:00
Daniel Sandler
ba860e6419 am b531c81c: Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev 
* commit 'b531c81cdb262bfb75d1637c12ef22f06fbd4968':
  Introduce ACTION_QUICK_CLOCK for the QS time tile.
 2012-10-02 10:58:08 -07:00
Daniel Sandler
b531c81cdb Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev 2012-10-02 10:53:12 -07:00
Eric Laurent
3de070d5bd am aade5d14: am 57e62034: Merge "enable safe media volume according to country" into jb-mr1-dev 
* commit 'aade5d14da459a25f08f78b0cb1d15aa2ce7d566':
  enable safe media volume according to country
 2012-10-02 10:02:31 -07:00
Eric Laurent
aade5d14da am 57e62034: Merge "enable safe media volume according to country" into jb-mr1-dev 
* commit '57e6203457cedbc6f4bf8a45635862a3eb717e9f':
  enable safe media volume according to country
 2012-10-02 10:00:45 -07:00
Eric Laurent
57e6203457 Merge "enable safe media volume according to country" into jb-mr1-dev 2012-10-02 09:58:03 -07:00
Dianne Hackborn
02a3db9c62 am 79819093: am 11d8481f: Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev 
* commit '7981909339d0ccd711efaf2ed531be8b57aeb270':
  Fix framework side of #7132432 com.android.vending:...
 2012-10-02 09:29:12 -07:00
Dianne Hackborn
7981909339 am 11d8481f: Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev 
* commit '11d8481f10a12caef0cfd9be7fe86e61d953d58f':
  Fix framework side of #7132432 com.android.vending:...
 2012-10-02 09:26:34 -07:00
Dianne Hackborn
11d8481f10 Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev 2012-10-02 09:22:12 -07:00
Eric Laurent
d640bd325c enable safe media volume according to country 
Enable safe headphone volume feature for all countries that
do not opt otherwise in their mmc configuration.
Opt out for US.

Bug 7231029.

Change-Id: I2619d627508eb2cd1f73db9242e0cb5efa839a2a
 2012-10-02 08:46:26 -07:00
John Spurlock
7e3fcda77f am 81f89278: am bd27ea2e: Merge "Update javadocs for DreamService." into jb-mr1-dev 
* commit '81f8927884610ea7bf9a7af59738eb3e3d0a4798':
  Update javadocs for DreamService.
 2012-10-02 07:59:55 -07:00
John Spurlock
81f8927884 am bd27ea2e: Merge "Update javadocs for DreamService." into jb-mr1-dev 
* commit 'bd27ea2e125efd57676d34b4d6f24445f139c2e7':
  Update javadocs for DreamService.
 2012-10-02 07:58:32 -07:00
John Spurlock
bd27ea2e12 Merge "Update javadocs for DreamService." into jb-mr1-dev 2012-10-02 07:56:06 -07:00
Svetoslav Ganov
1a17084c4d am ef89d33f: am 30ed33b1: Merge "Owner should not be announces as a user switch." into jb-mr1-dev 
* commit 'ef89d33f5bc90e3a0527ac91e00385f47937612c':
  Owner should not be announces as a user switch.
 2012-10-01 23:38:30 -07:00
Svetoslav Ganov
814615212f am a6404170: am 0a551d6b: Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev 
* commit 'a6404170784609bd1ed0771e612a7d30fec62624':
  Upading the strings for the global accessibility enabling gesture.
 2012-10-01 23:38:26 -07:00
Svetoslav Ganov
ef89d33f5b am 30ed33b1: Merge "Owner should not be announces as a user switch." into jb-mr1-dev 
* commit '30ed33b141dd1add916466c193b6735cd0bf8315':
  Owner should not be announces as a user switch.
 2012-10-01 23:33:27 -07:00
Svetoslav Ganov
a640417078 am 0a551d6b: Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev 
* commit '0a551d6b36ace1388bea572be1a5b7c53c506a51':
  Upading the strings for the global accessibility enabling gesture.
 2012-10-01 23:33:18 -07:00
Baligh Uddin
43d091b885 am 506a9224: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 
* commit '506a922469ff9d3064d648592aa896ee62b3142b':
  Revert "Import translations. DO NOT MERGE"
 2012-10-01 23:33:14 -07:00
Adam Cohen
7ffa8c08f3 Fixing up keyguard widget pager layouts 
-> Related to issue 7232481 and issue 7261844

Change-Id: Ib3c15ed78d3473036820bb3061dcd1cd34a2bfc4
 2012-10-01 21:51:18 -07:00
Svetoslav Ganov
30ed33b141 Merge "Owner should not be announces as a user switch." into jb-mr1-dev 2012-10-01 21:19:11 -07:00
Svetoslav Ganov
0a551d6b36 Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev 2012-10-01 21:19:11 -07:00
Baligh Uddin
506a922469 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 2012-10-01 21:09:08 -07:00
Baligh Uddin
bab210d597 Revert "Import translations. DO NOT MERGE" 
Broken build - sorry

This reverts commit a239b46722427ec7d37710c20917d97649b85127

Change-Id: Id74623459743790046573b2f018aee9a6b509886
 2012-10-01 21:02:56 -07:00
Svetoslav Ganov
59f07690c2 Owner should not be announces as a user switch. 
1. The accessibility layer announces user switches. Even though
   the initial switch to the owner on a singe user device is a
   valid use switch we should not announce it for accessibility.

bug:7264693

Change-Id: Idf022fab6b74c84b7a96bc4ed7c7fee2b83029a6
 2012-10-01 19:22:43 -07:00
Svetoslav Ganov
9a455fbe71 Upading the strings for the global accessibility enabling gesture. 
bug:7255486

Change-Id: I10b0e5a97518bbb442656c142bf2c822f897331b
 2012-10-01 18:45:21 -07:00
Dianne Hackborn
689586d067 Fix framework side of #7132432 com.android.vending:... 
...java.lang.IllegalStateException: Can not perform this action
after onSaveInstanceStateat android.support.v4.app.FragmentManagerImpl
.checkStateLoss(FragmentManager.java:1300)

Framework fragment manager also needs to be told its state is not
saved earlier.

Change-Id: Ie5bb327fca6208f7eea6146a1b3223c61c9ecef6
 2012-10-01 18:23:04 -07:00
Ian Rogers
bc8c3c05a3 am 7fef2b8a: Fix target utilization property_get. 
* commit '7fef2b8a3782a94e1ad6bfef98807167db300aab':
  Fix target utilization property_get.
 2012-10-01 17:35:24 -07:00
Ian Rogers
7fef2b8a37 Fix target utilization property_get. 
Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.

b/7062303

Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
 2012-10-01 17:30:32 -07:00
Ian Rogers
bfa10630c8 Merge "Fix target utilization property_get." into jb-mr1-dev 2012-10-01 17:25:55 -07:00
Baligh Uddin
448858dff3 am aae92acf: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'aae92acf9c44a2ee27c0010e62e0703bda485fe8':
  Import translations. DO NOT MERGE
 2012-10-01 17:20:31 -07:00
Baligh Uddin
aae92acf9c Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-01 17:17:42 -07:00
Fabrice Di Meglio
36eeab6813 am 43f5815c: am 2b77c102: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '43f5815c488a674dc02384c2f0c708ca55ef55c5':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-10-01 16:59:23 -07:00
Fabrice Di Meglio
43f5815c48 am 2b77c102: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '2b77c102d231c692cc6cbe22b23a4183ea5a9ecc':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-10-01 16:55:57 -07:00
Fabrice Di Meglio
2b77c102d2 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 2012-10-01 16:52:37 -07:00
Svetoslav Ganov
f7d1589067 am e56dfc1f: am d8357cee: Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev 
* commit 'e56dfc1f8cf588b8e13b4991858385c984bc5436':
  Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
 2012-10-01 16:46:39 -07:00
Svetoslav Ganov
e56dfc1f8c am d8357cee: Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev 
* commit 'd8357ceec04ca8b9d8a5e25cb5484ce8f8e56e00':
  Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
 2012-10-01 16:43:31 -07:00
Craig Mautner
80944c5c92 am 397c8629: am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev 
* commit '397c862913c2c50e54d18dee7766b0ac93971ae3':
  Switch from uevent model to /dev/input/event.
 2012-10-01 16:43:27 -07:00
Craig Mautner
397c862913 am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev 
* commit 'b97d8764a0aa600d7bcc6242e7173453c87ee658':
  Switch from uevent model to /dev/input/event.
 2012-10-01 16:40:24 -07:00
Svetoslav Ganov
d8357ceec0 Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev 2012-10-01 16:40:18 -07:00
Craig Mautner
b97d8764a0 Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev 2012-10-01 16:38:46 -07:00
Fabrice Di Meglio
44bfaedd1e am 338a3853: am efe9b483: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 
* commit '338a3853e8cdd05fb87d623d8a1b476a329646e3':
  Fix bug #7259242 text is left justified with no padding
 2012-10-01 16:09:08 -07:00
Fabrice Di Meglio
338a3853e8 am efe9b483: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 
* commit 'efe9b483547ac44dbc88bdfd6a54be5c95c2d889':
  Fix bug #7259242 text is left justified with no padding
 2012-10-01 16:06:58 -07:00
Fabrice Di Meglio
efe9b48354 Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 2012-10-01 16:04:40 -07:00
Adam Powell
5c68e4003b am e9234dd1: am 075bb6b3: Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev 
* commit 'e9234dd1edc8988f41f1cb947e4df6e245d37cd1':
  DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
 2012-10-01 16:00:11 -07:00
Casey Burkhardt
4aeb961de2 Sets accessibility importance for the home/up button. 
Bug: 7196985
Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
 2012-10-01 15:57:17 -07:00
Adam Powell
e9234dd1ed am 075bb6b3: Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev 
* commit '075bb6b3dfb9e58aa44c3b8588ab233a832956a3':
  DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
 2012-10-01 15:56:58 -07:00
Adam Powell
075bb6b3df Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev 2012-10-01 15:53:49 -07:00