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

133824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
2059bce9d6 Merge "Further work on voice interaction services." 2014-05-05 18:32:03 +00:00
Dianne Hackborn
c03c9167c2 Further work on voice interaction services. 
This makes VoiceInteractionSession a more first-class
concept.  Now the flow is that a VoiceInteractionService
calls startSession() when it wants to begin a session.
This will result in a new VoiceInteractionSession via the
VoiceInteractionSessionService containing it, and the
session at that point an decide what to do.  It can now
show UI, and it is what has access to the startVoiceActivity
API.

Change-Id: Ie2b85b3020ef1206d3f44b335b128d064e8f9935
 2014-05-05 11:18:08 -07:00
Jason Monk
d9bc4419f8 am e7b37a9b: Merge "Add null check on navigation bar visibility" 
* commit 'e7b37a9be353ae21aa782dda20bfc8fc46bc4bac':
  Add null check on navigation bar visibility
 2014-05-05 18:17:41 +00:00
Jason Monk
f593c9d728 Merge "Add null check on navigation bar visibility" 2014-05-05 18:14:27 +00:00
Jason Monk
73b0c8e523 am c34e5f16: Merge "Don\'t show IME Switcher not. if nav bar exists" 
* commit 'c34e5f16405f0404eb0bf17fbf9443e4119a6f6b':
  Don't show IME Switcher not. if nav bar exists
 2014-05-05 18:13:44 +00:00
Jason Monk
db6d7a5971 Merge "Don't show IME Switcher not. if nav bar exists" 2014-05-05 18:09:50 +00:00
John Reck
18f16e6fba TIME LORD! 
Bug: 14444180

Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
 2014-05-05 10:57:04 -07:00
Ruben Brunk
65ca9b6d97 am 03c1223b: Merge "camera3: Update CameraMetadata vendor tag handling." 
* commit '03c1223b4c19784b7bda6a4aa8b24f38e67b913f':
  camera3: Update CameraMetadata vendor tag handling.
 2014-05-05 17:43:17 +00:00
Ruben Brunk
6b003c9e3c Merge "camera3: Update CameraMetadata vendor tag handling." 2014-05-05 17:40:16 +00:00
Zhijun He
4793af5e35 Camera2: make videostabilization type consistent 
Make it consistent with availableVideoStabilizationModes and its optical
stabilization relatives.

Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0
 2014-05-05 10:39:12 -07:00
David Friedman
b10c683995 am 095f7670: am 68e048d8: am 20d125de: am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do g 
* commit '095f767031c0c23f34b2f3c77073bc8008757145':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:22:57 +00:00
David Friedman
26ebd62b57 am 68e048d8: am 20d125de: am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game developme 
* commit '68e048d85a539f1b8531f53b6192d99f0c2b1c47':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:19:14 +00:00
David Friedman
68e048d85a am 20d125de: am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem 
* commit '20d125dedb8bde016389ee97a0cefcc97bb02a81':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:16:22 +00:00
David Friedman
20d125dedb am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that 
* commit 'fd876194cf12352545048f77f626c839cc7ef787':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:12:53 +00:00
Baligh Uddin
8ff936bb51 Import translations. DO NOT MERGE 
Change-Id: Ifed118163b8a144fac76be179448479108ff9561
Auto-generated-cl: translation import
 2014-05-05 10:08:33 -07:00
David Friedman
fd876194cf am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat 
* commit '4146d546a4ab8465970e7c73bf1e9e00767931b6':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:07:55 +00:00
David Friedman
4146d546a4 Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs 2014-05-05 17:05:22 +00:00
Baligh Uddin
7808437f42 Import translations. DO NOT MERGE 
Change-Id: I406e993a5b1a7225be0da7bbc25bdeb6cb7e98ae
Auto-generated-cl: translation import
 2014-05-05 09:25:01 -07:00
John Spurlock
5dfe735f70 am 99aae66d: Merge "Log all notification interceptions." 
* commit '99aae66d599cdbc8d8436c7bfd5a981e5af864a6':
  Log all notification interceptions.
 2014-05-05 13:26:51 +00:00
John Spurlock
29e594c520 Merge "Log all notification interceptions." 2014-05-05 13:24:08 +00:00
John Spurlock
c8d7ab9ff9 Log all notification interceptions. 
Change-Id: I036a4b5eb7c5a3ce2addb0a16d9d6806e3952929
 2014-05-05 09:22:57 -04:00
John Spurlock
662525d826 am 2d9e0c32: Cleanup logspam. 
* commit '2d9e0c32a812d1213d79919f9ee1df6abc2eb675':
  Cleanup logspam.
 2014-05-05 12:53:19 +00:00
John Spurlock
efc1a289c6 Cleanup logspam. 
Change-Id: I21b39458147e911da3ab7a260c13abf7ec4eea5d
 2014-05-05 08:43:08 -04:00
Zhijun He
575d6966d2 am 0219201c: Merge "Camera2: Minor update for hyperfocalDistance spec" 
* commit '0219201ca06203303099fb284bdeee488bf5ab53':
  Camera2: Minor update for hyperfocalDistance spec
 2014-05-04 23:41:14 +00:00
Zhijun He
dab4049383 Merge "Camera2: Minor update for hyperfocalDistance spec" 2014-05-04 23:38:28 +00:00
Zhijun He
b41fcc2506 Camera2: Minor update for hyperfocalDistance spec 
Doc only change.

Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
 2014-05-04 16:29:57 -07:00
Jinsuk Kim
49aeb6e1d0 am 0c86ddd5: Update current.txt to fix the broken build 
* commit '0c86ddd5953c5c4ae5d3414074d089354e66aa4e':
  Update current.txt to fix the broken build
 2014-05-04 23:20:49 +00:00
Jinsuk Kim
d0e2095180 Update current.txt to fix the broken build 
Change-Id: Ifaf9e2221791907b953995c5c4066528746811b3
 2014-05-05 08:16:11 +09:00
Jinsuk Kim
d8faf17dc8 am 8994ae73: Merge "Define Feature action for obtaining info on a new CEC device" 
* commit '8994ae7367ed687fcd6bd27486765f1ca89e05aa':
  Define Feature action for obtaining info on a new CEC device
 2014-05-04 21:55:38 +00:00
Jinsuk Kim
043aa252cf Merge "Define Feature action for obtaining info on a new CEC device" 2014-05-04 21:51:44 +00:00
Ruben Brunk
32ef3ae085 camera3: Update CameraMetadata vendor tag handling. 
Bug: 12134423
Change-Id: I19380fb5acc3e23a6181d8f858c13457993480fc
 2014-05-02 20:34:41 -07:00
Winson Chung
959681876c am 2e1bb944: Merge "Adding ability to load a search widget into Recents." 
* commit '2e1bb94421d996a45cbc2e5472a0fdaa3e2b921c':
  Adding ability to load a search widget into Recents.
 2014-05-03 02:03:09 +00:00
Winson Chung
c74b3cb6f0 Merge "Adding ability to load a search widget into Recents." 2014-05-03 01:58:10 +00:00
Winson Chung
56c4370eee am ee9b42a9: Merge "Incorporating theme colors into task views." 
* commit 'ee9b42a9a330b3225182761c542a095801835354':
  Incorporating theme colors into task views.
 2014-05-03 01:46:01 +00:00
Winson Chung
b66ef989d6 am e315e251: Merge "Refactoring activity method to update recents values." 
* commit 'e315e251f07d1346925048fb420312d792af6f9b':
  Refactoring activity method to update recents values.
 2014-05-03 01:45:57 +00:00
Winson Chung
f7bca430d9 Adding ability to load a search widget into Recents. 
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
 2014-05-02 18:45:40 -07:00
Winson Chung
7e78b8d3db Merge "Incorporating theme colors into task views." 2014-05-03 01:43:01 +00:00
Winson Chung
3e586e4621 Merge "Refactoring activity method to update recents values." 2014-05-03 01:42:42 +00:00
Winson Chung
f5e22e71cb Incorporating theme colors into task views. 
Change-Id: Ie7166d78dacabe4bff7afdade2d1da9d0651e403
 2014-05-02 18:35:35 -07:00
Jose Lima
cb08562056 am 9130633e: Merge "Allow activities to be visible behind the Home Stack" 
* commit '9130633e349deb079418ca0713b25480dca0444b':
  Allow activities to be visible behind the Home Stack
 2014-05-03 01:11:40 +00:00
Jose Lima
be2ba85c4f Merge "Allow activities to be visible behind the Home Stack" 2014-05-03 01:06:34 +00:00
Guang Zhu
7996d4dd4b am 69c6a3fe: am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '69c6a3fedd9ad198408dea9ebb9b9383f34e7117':
  add getAddress function to return BT mac
 2014-05-03 00:45:23 +00:00
Adam Powell
c69886edc0 am 94ffd117: Merge "ListViews in ScrollViews and ScrollViews in ListViews" 
* commit '94ffd117faef4b8a73c6ffb7ba0fdf2ebe1f05d4':
  ListViews in ScrollViews and ScrollViews in ListViews
 2014-05-03 00:41:32 +00:00
Guang Zhu
ce63f59906 am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '9284a37d601f8d90e868f6fb032ebb8b4e07029d':
  add getAddress function to return BT mac
 2014-05-03 00:39:06 +00:00
Alan Viverette
24d80907c3 am 5e6e7cf5: Merge "Fix ripple cancel" 
* commit '5e6e7cf57008f18687ee692da8de6d9a417c4df1':
  Fix ripple cancel
 2014-05-03 00:37:37 +00:00
Adam Powell
3feb0419d2 Merge "ListViews in ScrollViews and ScrollViews in ListViews" 2014-05-03 00:36:21 +00:00
Guang Zhu
9284a37d60 am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '1edfd835c2573711587cc77befeefd96083ccba5':
  add getAddress function to return BT mac
 2014-05-03 00:35:26 +00:00
Alan Viverette
223b1e0ba7 Merge "Fix ripple cancel" 2014-05-03 00:35:24 +00:00
Winson Chung
03a9baedc9 Refactoring activity method to update recents values. 
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
 2014-05-02 17:34:37 -07:00
Guang Zhu
1edfd835c2 Merge "add getAddress function to return BT mac" into klp-modular-dev 2014-05-03 00:32:58 +00:00