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

8035 Commits

Author SHA1 Message Date
Michael Kolb
d42eeab20f am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 00:48:13 +00:00
Michael Kolb
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00
Michael Kolb
6642e51ac5 Populate isRound from config.xml to WindowInsets 
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
 2014-04-17 17:32:50 -07:00
Vinit Deshapnde
734ccfbc7b am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '2585e15ef722c7bd8c320e57ded8ad67da121245':
  Don't reset country code once it is persisted
 2014-04-17 22:03:16 +00:00
Vinit Deshapnde
2585e15ef7 am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
  Don't reset country code once it is persisted
 2014-04-17 21:57:12 +00:00
Vinit Deshapnde
72358802d6 am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
  Don't reset country code once it is persisted
 2014-04-17 18:59:54 +00:00
Vinit Deshapnde
b5ee95edf9 Don't reset country code once it is persisted 
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.

Also removes some dead code related to resetting of country codes.

Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
 2014-04-17 11:05:21 -07:00
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 
* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
 2014-04-16 23:49:20 +00:00
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service. 
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
 2014-04-16 14:50:14 -07:00
Baligh Uddin
81cdde5631 Import translations. DO NOT MERGE 
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
 2014-04-16 14:32:46 -07:00
Baligh Uddin
f104f676e3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-16 15:28:29 +00:00
Vinod Krishnan
da34482dfc am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit '56a90cb8e1a136d6367c0006bf8689fcc97211cb':
  Set wearable specific strings in framework
 2014-04-15 23:48:24 +00:00
Vinod Krishnan
56a90cb8e1 Merge "Set wearable specific strings in framework" into klp-modular-dev 2014-04-15 23:45:26 +00:00
Baligh Uddin
8343a20437 Import translations. DO NOT MERGE 
Change-Id: I06501e9574457274ef7b0a3951a1d76b8c50fdac
Auto-generated-cl: translation import
 2014-04-14 10:06:45 -07:00
Aravind Akella
8ebd66c259 am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev 
* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-11 19:34:51 +00:00
Aravind Akella
cd4c1c714c Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev 2014-04-11 19:32:38 +00:00
Vinod Krishnan
033ae3abb5 Set wearable specific strings in framework 
Change-Id: I81e7d55c53809199a340c9c16070b55ffbaeefc0
 2014-04-11 10:58:03 -07:00
Aravind Akella
cd9a7bb3ba Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1.

Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
 2014-04-11 00:05:24 +00:00
Baligh Uddin
f7d65ae852 Import translations. DO NOT MERGE 
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
 2014-04-09 09:53:03 -07:00
Baligh Uddin
c4a80acf9c Import translations. DO NOT MERGE 
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
 2014-04-07 09:16:57 -07:00
Etienne Le Grand
acf395fd94 am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 09:05:50 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
 2014-04-05 04:47:14 +00:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 01:52:27 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
 2014-04-04 16:31:08 -07:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Jeff Tinker
4f342e878d am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
  Add signature|system permission to MediaDrm signer APIs
 2014-04-03 01:35:28 +00:00
Jeff Tinker
4995d72520 Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 2014-04-03 01:30:42 +00:00
Jeff Tinker
65c94e6959 Add signature|system permission to MediaDrm signer APIs 
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/

Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
 2014-04-02 16:43:10 -07:00
Baligh Uddin
65b2d089c3 Import translations. DO NOT MERGE 
Change-Id: Iedc52a08baa64f6294add074ebf597d09c06725a
Auto-generated-cl: translation import
 2014-04-02 08:49:36 -07:00
Baligh Uddin
ca0513026a Import translations. DO NOT MERGE 
Change-Id: I3ba9a4dc3048b098598e12a78e7cc7dde521ea56
Auto-generated-cl: translation import
 2014-04-02 08:41:45 -07:00
Michael Kolb
2c73e08d36 am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev 
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
  Add outset to decor view measuring
 2014-04-01 20:46:38 +00:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
Michael Kolb
5de886a158 Add outset to decor view measuring 
Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
 2014-03-31 16:49:55 -07:00
Baligh Uddin
23f64109d0 Import translations. DO NOT MERGE 
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
 2014-03-31 11:37:11 -07:00
Baligh Uddin
dc5e02bdcc Import translations. DO NOT MERGE 
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
 2014-03-31 11:34:59 -07:00
Aaron Whyte
23fd13de62 am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys. 
* commit 'f10d0399bf5f519dff414a9d195a0eaacb37f9b7':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:03:56 +00:00
Aaron Whyte
f10d0399bf Made secure-adb's new-public-key activity configurable. 
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.

Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
 2014-03-28 22:21:55 +00:00
Jeff Sharkey
0a42e5fa29 am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '2d8f330fe709d405915ebb1fa2673e575e19112e':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:56:08 +00:00
Jeff Sharkey
2d8f330fe7 am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit 'a686d16d5924d2afe06586110e7dca33ecad535c':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:49:21 +00:00
Jeff Sharkey
a686d16d59 am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '0bc7cea6aa2523f9f519f63038c541cb1b1942a8':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:43:53 +00:00
Jeff Sharkey
0bc7cea6aa Enlarge space allowed for internal downloads. 
Bug: 13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
 2014-03-27 18:16:32 -07:00
Baligh Uddin
b79bceeb6f Import translations. DO NOT MERGE 
Change-Id: I4da32094b7c44f5042c276dc7dd2aef2132ffca9
Auto-generated-cl: translation import
 2014-03-26 11:08:06 -07:00
Baligh Uddin
9ac253ffed Import translations. DO NOT MERGE 
Change-Id: I9e363ec3f4253e6496f1c6cc6019bb807388e7f4
Auto-generated-cl: translation import
 2014-03-26 11:06:02 -07:00
Will Haldean Brown
f3f1c7a334 am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit '63d161e4ae57b61b33d77f4ea3c91279a6acb807':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:47:06 +00:00
Will Haldean Brown
63d161e4ae Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 2014-03-25 21:39:17 +00:00
Will Haldean Brown
61e0965678 Remove all but two micro themes, light and dark. 
Bug: 13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
 2014-03-25 13:38:33 -07:00
Baligh Uddin
d3ff73381e Import translations. DO NOT MERGE 
Change-Id: I2c8a0e45a30fdb43c65abce0a9db7eec1591363a
Auto-generated-cl: translation import
 2014-03-24 09:48:18 -07:00
Baligh Uddin
077587fb50 Import translations. DO NOT MERGE 
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
 2014-03-24 09:46:08 -07:00