Dianne Hackborn
d9d9c17dda
am 77216642: Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev
...
* commit '77216642884d5131290803776b0fce4d68128e97':
Implement #7341342 API request: way to determine current orientation...
2013-04-11 17:11:21 -07:00
Dianne Hackborn
7721664288
Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev
2013-04-12 00:08:13 +00:00
Dianne Hackborn
b9ec1ac51b
Implement #7341342 API request: way to determine current orientation...
...
...to allow for orientation locking
This doesn't add an API to get the current orientation, since that is
inherantly racy. Instead there is a new "locked" orientation mode that
locks the screen into whatever the current rotation is.
While at it, added a few other useful orientation modes.
Change-Id: I5c369e6511cb72294e9e922ea8acffd770df9440
2013-04-11 17:07:40 -07:00
Robert Greenwalt
5ec50ebd9a
am b7e6a443: Merge "Routing workaround." into jb-mr2-dev
...
* commit 'b7e6a4433bda6c59540ffc51061aff5cc3d10166':
Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
b7e6a4433b
Merge "Routing workaround." into jb-mr2-dev
2013-04-11 23:27:20 +00:00
Jim Miller
cda712266f
am eec68e55: Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev
...
* commit 'eec68e55cc6661837030c8ecb4386d05b1d31685':
Fix keyguard pattern invalidate bug
2013-04-11 15:41:03 -07:00
Jim Miller
cce961c134
am 22626107: Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev
...
* commit '22626107841e928d472e8258c0d2cefccf9c9b81':
Fix bug where transport shows all the time in keyguard
2013-04-11 15:40:59 -07:00
Jim Miller
eec68e55cc
Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev
2013-04-11 22:37:59 +00:00
Jim Miller
2262610784
Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev
2013-04-11 22:37:34 +00:00
Jeff Sharkey
ce6d3ed612
am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
...
* commit '6f0a36e691fd4c434a80631e4dda212d35745d83':
Enforce READ_EXTERNAL_STORAGE on emulator.
2013-04-11 15:19:38 -07:00
Jeff Sharkey
6f0a36e691
Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
2013-04-11 22:16:51 +00:00
Benjamin Poiesz
b3ebc306c2
am fc9f07dd: Merge "Adding LocalePicker support for the zz_ZZ pseudolocale" into jb-mr2-dev
...
* commit 'fc9f07dd4b6a900606c51cb67bedfbfe9de6e6d5':
Adding LocalePicker support for the zz_ZZ pseudolocale
2013-04-11 15:06:30 -07:00
Benjamin Poiesz
fc9f07dd4b
Merge "Adding LocalePicker support for the zz_ZZ pseudolocale" into jb-mr2-dev
2013-04-11 22:04:01 +00:00
Robert Greenwalt
63582a790e
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
...
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
ccbe7e6ff1
Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
2013-04-11 21:11:44 +00:00
Benjamin Poiesz
39f96f95c3
Adding LocalePicker support for the zz_ZZ pseudolocale
...
Bug #8556677
Change-Id: I47244765b240f1ba66eadbef4ac712cf4367566e
2013-04-11 13:49:54 -07:00
Nick Kralevich
c5931edb4c
am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
...
* commit 'c65e463356e9c8b646e80d0bfb6cfc76a0a1b426':
Optional <uses-permission> not yet supported.
2013-04-11 13:01:27 -07:00
Nick Kralevich
c65e463356
Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
2013-04-11 19:56:55 +00:00
Jamie Gennis
8a675b9aca
am 6e8a2dd3: Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
...
* commit '6e8a2dd3e66e65008a70fc09f6532b231d9b5f27':
Trace: unhide app tracing APIs
2013-04-11 12:50:10 -07:00
Jamie Gennis
6e8a2dd3e6
Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
2013-04-11 19:47:25 +00:00
Scott Main
2f8caf6a74
am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev
...
* commit 'dac80f633977308ec87cca1dea802e81d0fb75ad':
add api level 18 to javadoc 'since' tags
2013-04-11 12:03:54 -07:00
Scott Main
dac80f6339
Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-dev
2013-04-11 19:01:01 +00:00
Scott Main
0b234469bf
am 873a39cd: am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '873a39cd3cc9f2319819cb94bc80a0e15a6d565b':
delete orphaned/redirected files
2013-04-11 11:53:14 -07:00
Scott Main
873a39cd3c
am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '6ca3484c3fb8ffd78bc67e2ded7687b11ec76b5e':
delete orphaned/redirected files
2013-04-11 11:47:46 -07:00
Scott Main
6ca3484c3f
am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '430e0c77aae517bfe45700a81251864723719827':
delete orphaned/redirected files
2013-04-11 11:45:25 -07:00
Scott Main
430e0c77aa
am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit 'f24a3798781719e99ce45373942f4199e748d59d':
delete orphaned/redirected files
2013-04-11 11:42:12 -07:00
Scott Main
f24a379878
am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit 'd17356b0e23cf79eb1e0dd2f2fadbe4a7f56e886':
delete orphaned/redirected files
2013-04-11 11:39:43 -07:00
Scott Main
0d9e45a24e
add api level 18 to javadoc 'since' tags
...
Change-Id: Iea2e13ef2fad47d6a19d380b5655aeeda0414930
2013-04-11 11:37:29 -07:00
Scott Main
d17356b0e2
am f2f5b6ef: delete orphaned/redirected files
...
* commit 'f2f5b6ef987e30919907cf5417fb2b7cac9e2256':
delete orphaned/redirected files
2013-04-11 11:37:28 -07:00
Jaikumar Ganesh
ea4f556f70
am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev
...
* commit '651f99cb5588ccd313e2e532a6b9ccf9d679ff44':
Sensor values changes.
2013-04-11 10:53:23 -07:00
Jaikumar Ganesh
efda6203cd
am 28327210: Merge "Add new sensor types." into jb-mr2-dev
...
* commit '283272103bb6e0913c51c6b5c1de0f39608dd234':
Add new sensor types.
2013-04-11 10:53:21 -07:00
Jaikumar Ganesh
380043deb0
am 9a8df4dc: Add new sensor types.
...
* commit '9a8df4dcf9f83c1cf0cd8dedeb51d1ff8a52a2b5':
Add new sensor types.
2013-04-11 10:53:18 -07:00
Jaikumar Ganesh
651f99cb55
Merge "Sensor values changes." into jb-mr2-dev
2013-04-11 17:51:25 +00:00
Jaikumar Ganesh
283272103b
Merge "Add new sensor types." into jb-mr2-dev
2013-04-11 17:51:00 +00:00
Jaikumar Ganesh
9a8df4dcf9
Add new sensor types.
...
1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.
Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
2013-04-11 10:25:35 -07:00
Jaikumar Ganesh
6d0c1d78f1
Sensor values changes.
...
1. Remove Sensor Event Pool.
2. Allocate fixed array values for each Sensor added.
- Needed for backward compatibility.
3. Use SDK checks for backward compatibility for
rotation vector.
b/8165631
Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
2013-04-11 10:25:35 -07:00
Nick Kralevich
32eb5b1824
Optional <uses-permission> not yet supported.
...
Change-Id: Ieaa97a29db75161f35905ff340b2c525bbf50612
2013-04-11 10:20:09 -07:00
The Android Open Source Project
8111f049a1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ifb42e43150519a7abeb6f70ec4ae34f5f8a35220
2013-04-11 07:45:07 -07:00
The Android Automerger
8f38062b98
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:34 -07:00
Matthew Xie
09e49980df
am f8a67f4f: Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
...
* commit 'f8a67f4f5dd4c5499a6e7148331f0286e31203ec':
Make BluetoothGattServer.close() public
2013-04-10 23:09:41 -07:00
Matthew Xie
f8a67f4f5d
Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
2013-04-11 06:07:33 +00:00
Tim Murray
4e8a3bcf03
am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
...
* commit '3eba934a2747f71fa0aba2e1949567c786265359':
Clean up USAGE_SHARED and add syncing for USAGE_SHARED.
2013-04-10 21:56:04 -07:00
Tim Murray
3eba934a27
Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
2013-04-11 04:50:32 +00:00
Scott Main
9908c6744e
am ef0066a8: am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'ef0066a8c35b29dcf308b8e51a664ce044e79f61':
add meta tags to the rest of the training classes
2013-04-10 19:35:55 -07:00
Scott Main
f2f5b6ef98
delete orphaned/redirected files
...
Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
2013-04-10 19:31:56 -07:00
Scott Main
ef0066a8c3
am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bc80d99bd9bbf747b42137a24d63a17f71e276d2':
add meta tags to the rest of the training classes
2013-04-10 19:30:08 -07:00
Scott Main
bc80d99bd9
am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '55aa87b2b36359441c3acb4222980fda8ba2c980':
add meta tags to the rest of the training classes
2013-04-10 19:25:59 -07:00
Amith Yamasani
b6812eabd4
am f900647a: Merge "Don\'t sync from adapters that haven\'t opted in to restricted accounts" into jb-mr2-dev
...
* commit 'f900647aa823165676d2fe9bcfcfc078d99649ab':
Don't sync from adapters that haven't opted in to restricted accounts
2013-04-10 19:25:36 -07:00
Scott Main
55aa87b2b3
am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bd6b22d8088df8d2c98e4d8f289ce0024164a1ad':
add meta tags to the rest of the training classes
2013-04-10 19:22:46 -07:00
Amith Yamasani
f900647aa8
Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev
2013-04-11 02:21:37 +00:00